diff --git a/DigitalData.UserManager.API/Controllers/AuthController.cs b/DigitalData.UserManager.API/Controllers/AuthController.cs
index 8cdeda4..b469a4f 100644
--- a/DigitalData.UserManager.API/Controllers/AuthController.cs
+++ b/DigitalData.UserManager.API/Controllers/AuthController.cs
@@ -13,6 +13,7 @@ namespace DigitalData.UserManager.API.Controllers;
 [ApiController]
 public class AuthController : ControllerBase
 {
+    [Obsolete("Use MediatR")]
     private readonly ILogger<UserController> _logger;
     [Obsolete("Use MediatR")]
     private readonly IUserService _userService;
diff --git a/DigitalData.UserManager.API/Controllers/ModuleController.cs b/DigitalData.UserManager.API/Controllers/ModuleController.cs
index f9cc319..0029f14 100644
--- a/DigitalData.UserManager.API/Controllers/ModuleController.cs
+++ b/DigitalData.UserManager.API/Controllers/ModuleController.cs
@@ -7,8 +7,10 @@ using Microsoft.AspNetCore.Authorization;
 namespace DigitalData.UserManager.API.Controllers;
 
 [Authorize]
+[Obsolete("Use MediatR")]
 public class ModuleController : ReadControllerBaseWithErrorHandling<IModuleService, ModuleDto, Module, int>
 {
+    [Obsolete("Use MediatR")]
     public ModuleController(ILogger<ModuleController> logger, IModuleService service) : base(logger, service)
     {
     }
diff --git a/DigitalData.UserManager.Application/MappingProfiles/GroupMappingProfile.cs b/DigitalData.UserManager.Application/MappingProfiles/GroupMappingProfile.cs
index 12ced0c..d145480 100644
--- a/DigitalData.UserManager.Application/MappingProfiles/GroupMappingProfile.cs
+++ b/DigitalData.UserManager.Application/MappingProfiles/GroupMappingProfile.cs
@@ -6,6 +6,7 @@ namespace DigitalData.UserManager.Application.MappingProfiles
 {
     public class GroupMappingProfile : Profile
     {
+        [Obsolete("Use DigitalData.Core.Exceptions and .Middleware")]
         public GroupMappingProfile()
         {
             CreateMap<Group, GroupCreateDto>();
diff --git a/DigitalData.UserManager.Application/MappingProfiles/GroupOfUserMappingProfile.cs b/DigitalData.UserManager.Application/MappingProfiles/GroupOfUserMappingProfile.cs
index efcb007..54542ab 100644
--- a/DigitalData.UserManager.Application/MappingProfiles/GroupOfUserMappingProfile.cs
+++ b/DigitalData.UserManager.Application/MappingProfiles/GroupOfUserMappingProfile.cs
@@ -6,6 +6,7 @@ namespace DigitalData.UserManager.Application.MappingProfiles
 {
     public class GroupOfUserMappingProfile : Profile
     {
+        [Obsolete("Use DigitalData.Core.Exceptions and .Middleware")]
         public GroupOfUserMappingProfile()
         {
             CreateMap<GroupOfUser, GroupOfUserCreateDto>();
@@ -17,4 +18,4 @@ namespace DigitalData.UserManager.Application.MappingProfiles
             CreateMap<GroupOfUserUpdateDto, GroupOfUser>();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/DigitalData.UserManager.Application/MappingProfiles/UserRepMappingProfile.cs b/DigitalData.UserManager.Application/MappingProfiles/UserRepMappingProfile.cs
index ed37e29..2edaff3 100644
--- a/DigitalData.UserManager.Application/MappingProfiles/UserRepMappingProfile.cs
+++ b/DigitalData.UserManager.Application/MappingProfiles/UserRepMappingProfile.cs
@@ -6,6 +6,7 @@ namespace DigitalData.UserManager.Application.MappingProfiles
 {
     public class UserRepMappingProfile : Profile
     {
+        [Obsolete("Use DigitalData.Core.Exceptions and .Middleware")]
         public UserRepMappingProfile()
         {
             CreateMap<UserRep, UserRepCreateDto>();
diff --git a/DigitalData.UserManager.DependencyInjection/Extensions.cs b/DigitalData.UserManager.DependencyInjection/Extensions.cs
index bfebd8b..1017adb 100644
--- a/DigitalData.UserManager.DependencyInjection/Extensions.cs
+++ b/DigitalData.UserManager.DependencyInjection/Extensions.cs
@@ -8,6 +8,7 @@ namespace DigitalData.UserManager.DependencyInjection;
 
 public static class Extensions
 {
+    [Obsolete("Use IRepository")]
     public static IServiceCollection AddUserManager<TDbContext>(this IServiceCollection services) 
         where TDbContext : DbContext, IUserManagerDbContext
     {
@@ -16,10 +17,11 @@ public static class Extensions
         return services;
     }
 
+    [Obsolete("Use MediatR")]
     public static IServiceCollection AddUserManager(this IServiceCollection services, Action<DbContextOptionsBuilder> optionsAction)
     {
         services.AddUserManagerInfrastructure(optionsAction);
         services.AddUserManagerApplication();
         return services;
     }
-}
+}
\ No newline at end of file
diff --git a/DigitalData.UserManager.Domain/Entities/User.cs b/DigitalData.UserManager.Domain/Entities/User.cs
index 9f25833..5487ee3 100644
--- a/DigitalData.UserManager.Domain/Entities/User.cs
+++ b/DigitalData.UserManager.Domain/Entities/User.cs
@@ -74,7 +74,11 @@ namespace DigitalData.UserManager.Domain.Entities
         [Column("DATE_FORMAT")]
         [StringLength(10)]
         [DefaultValue("dd.MM.yyyy")]
-        public string DateFormat { get; set; }
+        public
+#if NET7_0_OR_GREATER
+            required
+#endif
+            string DateFormat { get; set; }
 
         [Required]
         [Column("ACTIVE")]
diff --git a/DigitalData.UserManager.Infrastructure/DependencyInjection.cs b/DigitalData.UserManager.Infrastructure/DependencyInjection.cs
index c1059d8..8e5fdf9 100644
--- a/DigitalData.UserManager.Infrastructure/DependencyInjection.cs
+++ b/DigitalData.UserManager.Infrastructure/DependencyInjection.cs
@@ -1,5 +1,4 @@
-using DigitalData.UserManager.Application;
-using DigitalData.UserManager.Application.Contracts.Repositories;
+using DigitalData.UserManager.Application.Contracts.Repositories;
 using DigitalData.UserManager.Infrastructure.Contracts;
 using DigitalData.UserManager.Infrastructure.Repositories;
 using Microsoft.EntityFrameworkCore;
@@ -37,7 +36,8 @@ public static class DependencyInjection
     /// <param name="services">The <see cref="IServiceCollection"/> to which the services will be added.</param>
     /// <param name="optionsAction">An <see cref="Action{T}"/> to configure the <see cref="DbContextOptionsBuilder"/>.</param>
     /// <returns>The updated <see cref="IServiceCollection"/>.</returns>
+    [Obsolete("Use IRepository")]
     public static IServiceCollection AddUserManagerInfrastructure(this IServiceCollection services, Action<DbContextOptionsBuilder> optionsAction) => services
         .AddDbContext<UserManagerDbContext>(optionsAction)
         .AddUserManagerInfrastructure<UserManagerDbContext>();
-}
+}
\ No newline at end of file
diff --git a/DigitalData.UserManager.Infrastructure/Repositories/GroupOfUserRepository.cs b/DigitalData.UserManager.Infrastructure/Repositories/GroupOfUserRepository.cs
index c29bb97..eddc158 100644
--- a/DigitalData.UserManager.Infrastructure/Repositories/GroupOfUserRepository.cs
+++ b/DigitalData.UserManager.Infrastructure/Repositories/GroupOfUserRepository.cs
@@ -6,6 +6,7 @@ using DigitalData.UserManager.Application.Contracts.Repositories;
 
 namespace DigitalData.UserManager.Infrastructure.Repositories
 {
+    [Obsolete("Use Repository")]
     public class GroupOfUserRepository<TDbContext> : CRUDRepository<GroupOfUser, int, TDbContext>, IGroupOfUserRepository
         where TDbContext : DbContext, IUserManagerDbContext
     {
diff --git a/DigitalData.UserManager.Infrastructure/Repositories/ModuleRepository.cs b/DigitalData.UserManager.Infrastructure/Repositories/ModuleRepository.cs
index 798bac0..f618159 100644
--- a/DigitalData.UserManager.Infrastructure/Repositories/ModuleRepository.cs
+++ b/DigitalData.UserManager.Infrastructure/Repositories/ModuleRepository.cs
@@ -6,6 +6,7 @@ using Microsoft.EntityFrameworkCore;
 
 namespace DigitalData.UserManager.Infrastructure.Repositories;
 
+[Obsolete("Use Repository")]
 public class ModuleRepository<TDbContext> : CRUDRepository<Module, int, TDbContext>, IModuleRepository
     where TDbContext : DbContext, IUserManagerDbContext
 {