diff --git a/DigitalData.UserManager.API/Controllers/BaseAuthController.cs b/DigitalData.UserManager.API/Controllers/BaseAuthController.cs
index 89a38fb..8978202 100644
--- a/DigitalData.UserManager.API/Controllers/BaseAuthController.cs
+++ b/DigitalData.UserManager.API/Controllers/BaseAuthController.cs
@@ -1,5 +1,5 @@
-using DigitalData.Core.API;
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstraction.Application.DTO;
+using DigitalData.Core.API;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.Base;
 using DigitalData.UserManager.Application.DTOs.User;
@@ -10,6 +10,7 @@ using System.Security.Claims;
 namespace DigitalData.UserManager.API.Controllers;
 
 [Authorize]
+[Obsolete("Use MediatR")]
 public class BaseAuthController<TCRUDService, TCreateDto, TReadDto, TUpdateDto, TBaseEntity> : CRUDControllerBaseWithErrorHandling<TCRUDService, TCreateDto, TReadDto, TUpdateDto, TBaseEntity, int>
     where TCRUDService : IBaseService<TCreateDto, TReadDto, TBaseEntity>
     where TCreateDto : BaseCreateDto
diff --git a/DigitalData.UserManager.API/Controllers/DirectoryController.cs b/DigitalData.UserManager.API/Controllers/DirectoryController.cs
index e9f41ca..70b8a07 100644
--- a/DigitalData.UserManager.API/Controllers/DirectoryController.cs
+++ b/DigitalData.UserManager.API/Controllers/DirectoryController.cs
@@ -1,5 +1,4 @@
-using DigitalData.Core.Abstractions.Application;
-using DigitalData.UserManager.Application.Contracts;
+using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Caching.Memory;
@@ -7,14 +6,16 @@ using System.Diagnostics.CodeAnalysis;
 using System.Security.Claims;
 using DigitalData.UserManager.Application;
 using Microsoft.Extensions.Localization;
-using DigitalData.Core.DTO;
 using Microsoft.AspNetCore.Authorization;
+using DigitalData.Core.Abstraction.Application;
+using DigitalData.Core.Abstraction.Application.DTO;
 
 namespace DigitalData.UserManager.API.Controllers;
 
 [Route("api/[controller]")]
 [SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>")]
 [Authorize]
+[Obsolete("Use MediatR")]
 public class DirectoryController : ControllerBase
 {
     private readonly IUserService _userService;
diff --git a/DigitalData.UserManager.API/Controllers/GroupController.cs b/DigitalData.UserManager.API/Controllers/GroupController.cs
index 8a5fcd0..08c4bbc 100644
--- a/DigitalData.UserManager.API/Controllers/GroupController.cs
+++ b/DigitalData.UserManager.API/Controllers/GroupController.cs
@@ -1,4 +1,4 @@
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstraction.Application.DTO;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.Group;
 using DigitalData.UserManager.Domain.Entities;
@@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Mvc;
 namespace DigitalData.UserManager.API.Controllers;
 
 [Authorize]
+[Obsolete("Use MediatR")]
 public class GroupController : BaseAuthController<IGroupService, GroupCreateDto, GroupReadDto, GroupUpdateDto, Group>
 {
     public GroupController(ILogger<GroupController> logger, IGroupService service, IUserService userService) : base(logger, service, userService)
diff --git a/DigitalData.UserManager.API/Controllers/GroupOfUserController.cs b/DigitalData.UserManager.API/Controllers/GroupOfUserController.cs
index f73db31..c92dec2 100644
--- a/DigitalData.UserManager.API/Controllers/GroupOfUserController.cs
+++ b/DigitalData.UserManager.API/Controllers/GroupOfUserController.cs
@@ -1,4 +1,4 @@
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstraction.Application.DTO;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.GroupOfUser;
 using DigitalData.UserManager.Domain.Entities;
@@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Mvc;
 namespace DigitalData.UserManager.API.Controllers;
 
 [Authorize]
+[Obsolete("Use MediatR")]
 public class GroupOfUserController : BaseAuthController<IGroupOfUserService, GroupOfUserCreateDto, GroupOfUserReadDto, GroupOfUserUpdateDto, GroupOfUser>
 {
     public GroupOfUserController(ILogger<GroupOfUserController> logger, IGroupOfUserService service, IUserService userService) : base(logger, service, userService)
diff --git a/DigitalData.UserManager.API/Controllers/ModuleOfUserController.cs b/DigitalData.UserManager.API/Controllers/ModuleOfUserController.cs
index 4ac96b7..d92e532 100644
--- a/DigitalData.UserManager.API/Controllers/ModuleOfUserController.cs
+++ b/DigitalData.UserManager.API/Controllers/ModuleOfUserController.cs
@@ -1,5 +1,5 @@
+using DigitalData.Core.Abstraction.Application.DTO;
 using DigitalData.Core.API;
-using DigitalData.Core.DTO;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.ModuleOfUser;
 using DigitalData.UserManager.Domain.Entities;
@@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Mvc;
 namespace DigitalData.UserManager.API.Controllers;
 
 [Authorize]
+[Obsolete("Use MediatR")]
 public class ModuleOfUserController : CRUDControllerBaseWithErrorHandling<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 ec25936..0e370e6 100644
--- a/DigitalData.UserManager.API/Controllers/UserController.cs
+++ b/DigitalData.UserManager.API/Controllers/UserController.cs
@@ -1,4 +1,4 @@
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstraction.Application.DTO;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.User;
 using DigitalData.UserManager.Domain.Entities;
@@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Mvc;
 namespace DigitalData.UserManager.API.Controllers;
 
 [Authorize]
+[Obsolete("Use MediatR")]
 public class UserController : BaseAuthController<IUserService, UserCreateDto, UserReadDto, UserUpdateDto, User>
 {
     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 44576d1..816e61b 100644
--- a/DigitalData.UserManager.API/Controllers/UserRepController.cs
+++ b/DigitalData.UserManager.API/Controllers/UserRepController.cs
@@ -1,4 +1,4 @@
-using DigitalData.Core.DTO;
+using DigitalData.Core.Abstraction.Application.DTO;
 using DigitalData.UserManager.Application.Contracts;
 using DigitalData.UserManager.Application.DTOs.UserRep;
 using DigitalData.UserManager.Domain.Entities;
@@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Mvc;
 namespace DigitalData.UserManager.API.Controllers;
 
 [Authorize]
+[Obsolete("Use MediatR")]
 public class UserRepController : BaseAuthController<IUserRepService, UserRepCreateDto, UserRepReadDto, UserRepUpdateDto, UserRep>
 {
     public UserRepController(ILogger<UserRepController> logger, IUserRepService service, IUserService userService) : base(logger, service, userService)
diff --git a/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj b/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj
index b93c57b..6a94912 100644
--- a/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj
+++ b/DigitalData.UserManager.API/DigitalData.UserManager.API.csproj
@@ -22,7 +22,8 @@
 
   <ItemGroup>
     <PackageReference Include="DigitalData.Auth.Client" Version="1.3.7" />
-    <PackageReference Include="DigitalData.Core.API" Version="2.2.0" />
+    <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.0.0" />
+    <PackageReference Include="DigitalData.Core.API" Version="2.2.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.14" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.20" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.4" />
diff --git a/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj b/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj
index 618dd11..9f1f1cb 100644
--- a/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj
+++ b/DigitalData.UserManager.Application/DigitalData.UserManager.Application.csproj
@@ -26,6 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.0.0" />
     <PackageReference Include="DigitalData.Core.Application" Version="3.3.4" />
     <PackageReference Include="DigitalData.EmailProfilerDispatcher.Abstraction" Version="3.1.1" />
   </ItemGroup>
diff --git a/DigitalData.UserManager.DependencyInjection/DigitalData.UserManager.DependencyInjection.csproj b/DigitalData.UserManager.DependencyInjection/DigitalData.UserManager.DependencyInjection.csproj
index 89fbf60..24f0fd7 100644
--- a/DigitalData.UserManager.DependencyInjection/DigitalData.UserManager.DependencyInjection.csproj
+++ b/DigitalData.UserManager.DependencyInjection/DigitalData.UserManager.DependencyInjection.csproj
@@ -25,6 +25,10 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\DigitalData.UserManager.Application\DigitalData.UserManager.Application.csproj" />
     <ProjectReference Include="..\DigitalData.UserManager.Domain\DigitalData.UserManager.Domain.csproj" />
diff --git a/DigitalData.UserManager.Infrastructure/DigitalData.UserManager.Infrastructure.csproj b/DigitalData.UserManager.Infrastructure/DigitalData.UserManager.Infrastructure.csproj
index acab150..030c2ae 100644
--- a/DigitalData.UserManager.Infrastructure/DigitalData.UserManager.Infrastructure.csproj
+++ b/DigitalData.UserManager.Infrastructure/DigitalData.UserManager.Infrastructure.csproj
@@ -26,6 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.0.0" />
     <PackageReference Include="DigitalData.Core.Infrastructure" Version="2.1.1" />
   </ItemGroup>