diff --git a/DigitalData.UserManager.API/Controllers/GroupOfUserController.cs b/DigitalData.UserManager.API/Controllers/GroupOfUserController.cs
index 5c382b3..424cce3 100644
--- a/DigitalData.UserManager.API/Controllers/GroupOfUserController.cs
+++ b/DigitalData.UserManager.API/Controllers/GroupOfUserController.cs
@@ -1,4 +1,3 @@
-using DigitalData.Core.API;
 using DigitalData.Core.DTO;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.GroupOfUser;
@@ -9,9 +8,9 @@ using Microsoft.AspNetCore.Mvc;
 namespace DigitalData.UserManager.API.Controllers
 {
     [Authorize]
-    public class GroupOfUserController : CRUDControllerBaseWithErrorHandling<IGroupOfUserService, GroupOfUserCreateDto, GroupOfUserReadDto, GroupOfUserUpdateDto, GroupOfUser, int>
+    public class GroupOfUserController : BaseAuthController<IGroupOfUserService, GroupOfUserCreateDto, GroupOfUserReadDto, GroupOfUserUpdateDto, GroupOfUser>
     {
-        public GroupOfUserController(ILogger<GroupOfUserController> logger, IGroupOfUserService service) : base(logger, service)
+        public GroupOfUserController(ILogger<GroupOfUserController> logger, IGroupOfUserService service, IUserService userService) : base(logger, service, userService)
         {
         }
         
diff --git a/DigitalData.UserManager.API/Controllers/UserController.cs b/DigitalData.UserManager.API/Controllers/UserController.cs
index 8d38fff..3a99ed7 100644
--- a/DigitalData.UserManager.API/Controllers/UserController.cs
+++ b/DigitalData.UserManager.API/Controllers/UserController.cs
@@ -9,9 +9,9 @@ using Microsoft.AspNetCore.Mvc;
 namespace DigitalData.UserManager.API.Controllers
 {
     [Authorize]
-    public class UserController : CRUDControllerBaseWithErrorHandling<IUserService, UserCreateDto, UserReadDto, UserUpdateDto, User, int>
+    public class UserController : BaseAuthController<IUserService, UserCreateDto, UserReadDto, UserUpdateDto, User>
     {
-        public UserController(ILogger<UserController> logger, IUserService service) : base(logger, service)
+        public UserController(ILogger<UserController> logger, IUserService service) : base(logger, service, service)
         {
         }
 
diff --git a/DigitalData.UserManager.API/Controllers/UserRepController.cs b/DigitalData.UserManager.API/Controllers/UserRepController.cs
index 0c7bb2c..0b4c35d 100644
--- a/DigitalData.UserManager.API/Controllers/UserRepController.cs
+++ b/DigitalData.UserManager.API/Controllers/UserRepController.cs
@@ -1,18 +1,16 @@
-using DigitalData.Core.API;
-using DigitalData.Core.DTO;
+using DigitalData.Core.DTO;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.UserRep;
 using DigitalData.UserManager.Domain.Entities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Data.SqlClient;
 
 namespace DigitalData.UserManager.API.Controllers
 {
     [Authorize]
-    public class UserRepController : CRUDControllerBaseWithErrorHandling<IUserRepService, UserRepCreateDto, UserRepReadDto, UserRepUpdateDto, UserRep, int>
+    public class UserRepController : BaseAuthController<IUserRepService, UserRepCreateDto, UserRepReadDto, UserRepUpdateDto, UserRep>
     {
-        public UserRepController(ILogger<UserRepController> logger, IUserRepService service) : base(logger, service)
+        public UserRepController(ILogger<UserRepController> logger, IUserRepService service, IUserService userService) : base(logger, service, userService)
         {
         }
 
diff --git a/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs b/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs
index 5329ee2..703b869 100644
--- a/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs
+++ b/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs
@@ -1,8 +1,6 @@
-using DigitalData.Core.Abstractions.Application;
-using DigitalData.UserManager.Application.DTOs.GroupOfUser;
+using DigitalData.UserManager.Application.DTOs.GroupOfUser;
 using DigitalData.UserManager.Domain.Entities;
 using DigitalData.Core.DTO;
-using DigitalData.UserManager.Application.Services;
 
 namespace DigitalData.UserManager.Application.Contracts
 {
diff --git a/DigitalData.UserManager.Application/Contracts/IUserRepService.cs b/DigitalData.UserManager.Application/Contracts/IUserRepService.cs
index 4d8753a..baccf5b 100644
--- a/DigitalData.UserManager.Application/Contracts/IUserRepService.cs
+++ b/DigitalData.UserManager.Application/Contracts/IUserRepService.cs
@@ -1,8 +1,6 @@
-using DigitalData.Core.Abstractions.Application;
-using DigitalData.UserManager.Application.DTOs.UserRep;
+using DigitalData.UserManager.Application.DTOs.UserRep;
 using DigitalData.UserManager.Domain.Entities;
 using DigitalData.Core.DTO;
-using DigitalData.UserManager.Application.Services;
 
 namespace DigitalData.UserManager.Application.Contracts
 {
diff --git a/DigitalData.UserManager.Application/Services/UserService.cs b/DigitalData.UserManager.Application/Services/UserService.cs
index 85d3fbb..f23dc1d 100644
--- a/DigitalData.UserManager.Application/Services/UserService.cs
+++ b/DigitalData.UserManager.Application/Services/UserService.cs
@@ -1,5 +1,4 @@
 using AutoMapper;
-using DigitalData.Core.Application;
 using DigitalData.Core.DTO;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.User;