diff --git a/DigitalData.UserManager.API/Controllers/GroupController.cs b/DigitalData.UserManager.API/Controllers/GroupController.cs
index 9ae8522..c5558a8 100644
--- a/DigitalData.UserManager.API/Controllers/GroupController.cs
+++ b/DigitalData.UserManager.API/Controllers/GroupController.cs
@@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Mvc;
 namespace DigitalData.UserManager.API.Controllers
 {
     [Authorize]
-    public class GroupController : CRUDControllerBase<IGroupService, IGroupRepository, GroupCreateDto, GroupReadDto, GroupUpdateDto, Group, int>
+    public class GroupController : CRUDControllerBase<IGroupService, GroupCreateDto, GroupReadDto, GroupUpdateDto, Group, int>
     {
         public GroupController(ILogger<GroupController> logger, IGroupService service) : base(logger, service)
         {
diff --git a/DigitalData.UserManager.API/Controllers/GroupOfUserController.cs b/DigitalData.UserManager.API/Controllers/GroupOfUserController.cs
index 59bbbd2..6f658ac 100644
--- a/DigitalData.UserManager.API/Controllers/GroupOfUserController.cs
+++ b/DigitalData.UserManager.API/Controllers/GroupOfUserController.cs
@@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Mvc;
 namespace DigitalData.UserManager.API.Controllers
 {
     [Authorize]
-    public class GroupOfUserController : CRUDControllerBase<IGroupOfUserService, IGroupOfUserRepository, GroupOfUserCreateDto, GroupOfUserReadDto, GroupOfUserUpdateDto, GroupOfUser, int>
+    public class GroupOfUserController : CRUDControllerBase<IGroupOfUserService, GroupOfUserCreateDto, GroupOfUserReadDto, GroupOfUserUpdateDto, GroupOfUser, int>
     {
         public GroupOfUserController(ILogger<GroupOfUserController> logger, IGroupOfUserService service) : base(logger, service)
         {
diff --git a/DigitalData.UserManager.API/Controllers/ModuleController.cs b/DigitalData.UserManager.API/Controllers/ModuleController.cs
index 5ba99f0..725fcc8 100644
--- a/DigitalData.UserManager.API/Controllers/ModuleController.cs
+++ b/DigitalData.UserManager.API/Controllers/ModuleController.cs
@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Authorization;
 namespace DigitalData.UserManager.API.Controllers
 {
     [Authorize]
-    public class ModuleController : ReadControllerBase<IModuleService, IModuleRepository, ModuleDto, Module, int>
+    public class ModuleController : ReadControllerBase<IModuleService, ModuleDto, Module, int>
     {
         public ModuleController(ILogger<ModuleController> logger, IModuleService service) : base(logger, service)
         {
diff --git a/DigitalData.UserManager.API/Controllers/ModuleOfUserController.cs b/DigitalData.UserManager.API/Controllers/ModuleOfUserController.cs
index 39fe9d9..e858a85 100644
--- a/DigitalData.UserManager.API/Controllers/ModuleOfUserController.cs
+++ b/DigitalData.UserManager.API/Controllers/ModuleOfUserController.cs
@@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc;
 namespace DigitalData.UserManager.API.Controllers
 {
     [Authorize]
-    public class ModuleOfUserController : CRUDControllerBase<IModuleOfUserService, IModuleOfUserRepository, ModuleOfUserCreateDto, ModuleOfUserReadDto, ModuleOfUserUpdateDto, ModuleOfUser, int>
+    public class ModuleOfUserController : CRUDControllerBase<IModuleOfUserService, ModuleOfUserCreateDto, ModuleOfUserReadDto, ModuleOfUserUpdateDto, ModuleOfUser, int>
     {
         public ModuleOfUserController(ILogger<ModuleOfUserController> logger, IModuleOfUserService service) : base(logger, service)
         {
diff --git a/DigitalData.UserManager.API/Controllers/UserController.cs b/DigitalData.UserManager.API/Controllers/UserController.cs
index ca3bc51..bfa78cf 100644
--- a/DigitalData.UserManager.API/Controllers/UserController.cs
+++ b/DigitalData.UserManager.API/Controllers/UserController.cs
@@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc;
 namespace DigitalData.UserManager.API.Controllers
 {
     [Authorize]
-    public class UserController : CRUDControllerBase<IUserService, IUserRepository, UserCreateDto, UserReadDto, UserUpdateDto, User, int>
+    public class UserController : CRUDControllerBase<IUserService, UserCreateDto, UserReadDto, UserUpdateDto, User, int>
     {
         public UserController(ILogger<UserController> logger, IUserService service) : base(logger, service)
         {
diff --git a/DigitalData.UserManager.API/Controllers/UserRepController.cs b/DigitalData.UserManager.API/Controllers/UserRepController.cs
index 3c79a53..1b5bca5 100644
--- a/DigitalData.UserManager.API/Controllers/UserRepController.cs
+++ b/DigitalData.UserManager.API/Controllers/UserRepController.cs
@@ -10,7 +10,7 @@ using Microsoft.Data.SqlClient;
 namespace DigitalData.UserManager.API.Controllers
 {
     [Authorize]
-    public class UserRepController : CRUDControllerBase<IUserRepService, IUserRepRepository, UserRepCreateDto, UserRepReadDto, UserRepUpdateDto, UserRep, int>
+    public class UserRepController : CRUDControllerBase<IUserRepService, UserRepCreateDto, UserRepReadDto, UserRepUpdateDto, UserRep, int>
     {
         public UserRepController(ILogger<UserRepController> logger, IUserRepService service) : base(logger, service)
         {
diff --git a/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs b/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs
index 675b81e..d7aed21 100644
--- a/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs
+++ b/DigitalData.UserManager.Application/Contracts/IGroupOfUserService.cs
@@ -6,7 +6,7 @@ using DigitalData.Core.DTO;
 
 namespace DigitalData.UserManager.Application.Contracts
 {
-    public interface IGroupOfUserService : ICRUDService<IGroupOfUserRepository, GroupOfUserCreateDto, GroupOfUserReadDto, GroupOfUserUpdateDto, GroupOfUser, int>
+    public interface IGroupOfUserService : ICRUDService<GroupOfUserCreateDto, GroupOfUserReadDto, GroupOfUserUpdateDto, GroupOfUser, int>
     {
         Task<Result> DeleteAsyncByGroupUserId(int groupId, int userId);
 
diff --git a/DigitalData.UserManager.Application/Contracts/IGroupService.cs b/DigitalData.UserManager.Application/Contracts/IGroupService.cs
index 5c88a88..1ebf3b5 100644
--- a/DigitalData.UserManager.Application/Contracts/IGroupService.cs
+++ b/DigitalData.UserManager.Application/Contracts/IGroupService.cs
@@ -6,7 +6,7 @@ using DigitalData.Core.DTO;
 
 namespace DigitalData.UserManager.Application.Contracts
 {
-    public interface IGroupService : ICRUDService<IGroupRepository, GroupCreateDto, GroupReadDto, GroupUpdateDto, Group, int>
+    public interface IGroupService : ICRUDService<GroupCreateDto, GroupReadDto, GroupUpdateDto, Group, int>
     {
         Task<DataResult<int>> CreateAsync(DirectoryGroupDto dirGroup);
     }
diff --git a/DigitalData.UserManager.Application/Contracts/IModuleOfUserService.cs b/DigitalData.UserManager.Application/Contracts/IModuleOfUserService.cs
index b67e4f3..a9f380a 100644
--- a/DigitalData.UserManager.Application/Contracts/IModuleOfUserService.cs
+++ b/DigitalData.UserManager.Application/Contracts/IModuleOfUserService.cs
@@ -6,7 +6,7 @@ using DigitalData.UserManager.Infrastructure.Contracts;
 
 namespace DigitalData.UserManager.Application.Contracts
 {
-    public interface IModuleOfUserService : ICRUDService<IModuleOfUserRepository, ModuleOfUserCreateDto, ModuleOfUserReadDto, ModuleOfUserUpdateDto, ModuleOfUser, int>
+    public interface IModuleOfUserService : ICRUDService<ModuleOfUserCreateDto, ModuleOfUserReadDto, ModuleOfUserUpdateDto, ModuleOfUser, int>
     {
         Task<Result> DeleteAsyncByModuleUserId(int moduleId, int userId);
     }
diff --git a/DigitalData.UserManager.Application/Contracts/IModuleService.cs b/DigitalData.UserManager.Application/Contracts/IModuleService.cs
index 00a8f3b..98e02fc 100644
--- a/DigitalData.UserManager.Application/Contracts/IModuleService.cs
+++ b/DigitalData.UserManager.Application/Contracts/IModuleService.cs
@@ -5,7 +5,7 @@ using DigitalData.UserManager.Infrastructure.Contracts;
 
 namespace DigitalData.UserManager.Application.Contracts
 {
-    public interface IModuleService : IBasicCRUDService<IModuleRepository, ModuleDto, Module, int>
+    public interface IModuleService : IBasicCRUDService<ModuleDto, Module, int>
     {
     }
 }
\ No newline at end of file
diff --git a/DigitalData.UserManager.Application/Contracts/IUserRepService.cs b/DigitalData.UserManager.Application/Contracts/IUserRepService.cs
index e2ed47f..24b32ae 100644
--- a/DigitalData.UserManager.Application/Contracts/IUserRepService.cs
+++ b/DigitalData.UserManager.Application/Contracts/IUserRepService.cs
@@ -6,7 +6,7 @@ using DigitalData.Core.DTO;
 
 namespace DigitalData.UserManager.Application.Contracts
 {
-    public interface IUserRepService : ICRUDService<IUserRepRepository, UserRepCreateDto, UserRepReadDto, UserRepUpdateDto, UserRep, int>
+    public interface IUserRepService : ICRUDService<UserRepCreateDto, UserRepReadDto, UserRepUpdateDto, UserRep, int>
     {
         Task<DataResult<IEnumerable<UserRepReadDto>>> ReadAllAsync(bool withUser = false, bool withRepGroup = false, bool withRightGroup = false, bool withRepUser = false, int? userId = null);
     }
diff --git a/DigitalData.UserManager.Application/Contracts/IUserService.cs b/DigitalData.UserManager.Application/Contracts/IUserService.cs
index 7f31138..0bcd113 100644
--- a/DigitalData.UserManager.Application/Contracts/IUserService.cs
+++ b/DigitalData.UserManager.Application/Contracts/IUserService.cs
@@ -1,12 +1,11 @@
 using DigitalData.Core.Contracts.Application;
 using DigitalData.UserManager.Application.DTOs.User;
 using DigitalData.UserManager.Domain.Entities;
-using DigitalData.UserManager.Infrastructure.Contracts;
 using DigitalData.Core.DTO;
 
 namespace DigitalData.UserManager.Application.Contracts
 {
-    public interface IUserService : ICRUDService<IUserRepository, UserCreateDto, UserReadDto, UserUpdateDto, User, int>
+    public interface IUserService : ICRUDService<UserCreateDto, UserReadDto, UserUpdateDto, User, int>
     {
         Task<DataResult<IEnumerable<UserReadDto>>> ReadByModuleIdAsync(int moduleId);