diff --git a/.version b/.version
index baba1a6..fac754c 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-1.4.9.4
\ No newline at end of file
+1.4.11.5
\ No newline at end of file
diff --git a/Brizco.Api/Brizco.Api.csproj b/Brizco.Api/Brizco.Api.csproj
index c72375e..af05910 100644
--- a/Brizco.Api/Brizco.Api.csproj
+++ b/Brizco.Api/Brizco.Api.csproj
@@ -6,8 +6,8 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
-    <AssemblyVersion>1.4.9.4</AssemblyVersion>
-    <FileVersion>1.4.9.4</FileVersion>
+    <AssemblyVersion>1.4.11.5</AssemblyVersion>
+    <FileVersion>1.4.11.5</FileVersion>
   </PropertyGroup>
 
 	<ItemGroup>
diff --git a/Brizco.Api/Controllers/HealthController.cs b/Brizco.Api/Controllers/HealthController.cs
index 934d3fe..5d4f54c 100644
--- a/Brizco.Api/Controllers/HealthController.cs
+++ b/Brizco.Api/Controllers/HealthController.cs
@@ -1,5 +1,4 @@
-using Brizco.Common.Models.Api;
-using MD.PersianDateTime.Standard;
+using MD.PersianDateTime.Standard;
 using System.Diagnostics;
 
 namespace Brizco.Api.Controllers;
diff --git a/Brizco.Api/Controllers/RoleController.cs b/Brizco.Api/Controllers/RoleController.cs
index 35aae30..6ed8419 100644
--- a/Brizco.Api/Controllers/RoleController.cs
+++ b/Brizco.Api/Controllers/RoleController.cs
@@ -1,6 +1,4 @@
-using Brizco.Core.EntityServices;
-
-namespace Brizco.Api.Controllers;
+namespace Brizco.Api.Controllers;
 
 public class RoleController : ICarterModule
 {
diff --git a/Brizco.Api/WebFramework/Bases/ApiResultFilterAttribute.cs b/Brizco.Api/WebFramework/Bases/ApiResultFilterAttribute.cs
index 6b49bd6..a4f785c 100644
--- a/Brizco.Api/WebFramework/Bases/ApiResultFilterAttribute.cs
+++ b/Brizco.Api/WebFramework/Bases/ApiResultFilterAttribute.cs
@@ -1,7 +1,4 @@
-using Brizco.Common.Models.Api;
-using Brizco.Core.Models.Api;
-
-namespace Brizco.Api.WebFramework.Bases;
+namespace Brizco.Api.WebFramework.Bases;
 
 public class ApiResultFactory
 {
diff --git a/Brizco.Api/WebFramework/Bases/CrudController.cs b/Brizco.Api/WebFramework/Bases/CrudController.cs
index d70825f..5f5102e 100644
--- a/Brizco.Api/WebFramework/Bases/CrudController.cs
+++ b/Brizco.Api/WebFramework/Bases/CrudController.cs
@@ -1,8 +1,4 @@
-using Carter;
-using MediatR;
-using Microsoft.AspNetCore.Routing.Patterns;
-
-namespace Brizco.Api.WebFramework.Bases;
+namespace Brizco.Api.WebFramework.Bases;
 
 
 public class CrudEndpoint<TEntity, TGetAllQuery, TGetOneQuery, TCreateCommand, TUpdateCommand, TDeleteCommand>(
diff --git a/Brizco.Api/WebFramework/Configurations/ServiceExtensions.cs b/Brizco.Api/WebFramework/Configurations/ServiceExtensions.cs
index 72c9339..399ad22 100644
--- a/Brizco.Api/WebFramework/Configurations/ServiceExtensions.cs
+++ b/Brizco.Api/WebFramework/Configurations/ServiceExtensions.cs
@@ -80,7 +80,7 @@ public static class ServiceExtensions
         serviceCollection.AddDbContextFactory<ApplicationContext>(options =>
         {
             options.UseQueryTrackingBehavior(QueryTrackingBehavior.NoTracking);
-            options.UseNpgsql(Configuration.GetConnectionString("PostgresServer"), b => b.MigrationsAssembly("Brizco.Repository"))
+            options.UseNpgsql(Configuration.GetConnectionString("Postgres"), b => b.MigrationsAssembly("Brizco.Repository"))
                 .UseProjectAssembly(typeof(ApplicationUser).Assembly);
             //options.EnableServiceProviderCaching(true);
         }).BuildServiceProvider();
@@ -117,7 +117,7 @@ public static class ServiceExtensions
     {
         var marten = serviceCollection.AddMarten(options =>
         {
-            options.Connection(configuration.GetConnectionString("MartenDBServer")!);
+            options.Connection(configuration.GetConnectionString("MartenDB")!);
             if (environment.IsDevelopment())
                 options.AutoCreateSchemaObjects = AutoCreate.All;
         });
diff --git a/Brizco.Api/WebFramework/MiddleWares/ExceptionHandlerMiddleware.cs b/Brizco.Api/WebFramework/MiddleWares/ExceptionHandlerMiddleware.cs
index ed47480..32bf278 100644
--- a/Brizco.Api/WebFramework/MiddleWares/ExceptionHandlerMiddleware.cs
+++ b/Brizco.Api/WebFramework/MiddleWares/ExceptionHandlerMiddleware.cs
@@ -1,6 +1,4 @@
-using Brizco.Common.Models.Api;
-using Brizco.Core.Models.Api;
-using Task = System.Threading.Tasks.Task;
+using Task = System.Threading.Tasks.Task;
 
 namespace Brizco.Api.WebFramework.MiddleWares;
 
diff --git a/Brizco.Common/Extensions/DateTimeExtensions.cs b/Brizco.Common/Extensions/DateTimeExtensions.cs
index 04d1c64..e845223 100644
--- a/Brizco.Common/Extensions/DateTimeExtensions.cs
+++ b/Brizco.Common/Extensions/DateTimeExtensions.cs
@@ -1,6 +1,4 @@
-using MD.PersianDateTime.Standard;
-
-namespace Brizco.Common.Extensions
+namespace Brizco.Common.Extensions
 {
     public static class DateTimeExtensions
     {
diff --git a/Brizco.Common/Extensions/EnumExtensions.cs b/Brizco.Common/Extensions/EnumExtensions.cs
index cc342b6..c674cd7 100644
--- a/Brizco.Common/Extensions/EnumExtensions.cs
+++ b/Brizco.Common/Extensions/EnumExtensions.cs
@@ -1,5 +1,4 @@
-using System.ComponentModel.DataAnnotations;
-using System.Reflection;
+using System.Reflection;
 
 namespace Brizco.Common.Extensions
 {
diff --git a/Brizco.Common/Extensions/PropertyExtensions.cs b/Brizco.Common/Extensions/PropertyExtensions.cs
index d524ef2..465b122 100644
--- a/Brizco.Common/Extensions/PropertyExtensions.cs
+++ b/Brizco.Common/Extensions/PropertyExtensions.cs
@@ -1,5 +1,4 @@
-using System.ComponentModel.DataAnnotations;
-using System.Reflection;
+using System.Reflection;
 
 namespace Brizco.Common.Extensions
 {
diff --git a/Brizco.Common/Models/Api/ApiResultStatusCode.cs b/Brizco.Common/Models/Api/ApiResultStatusCode.cs
index aa8cb77..0464bee 100644
--- a/Brizco.Common/Models/Api/ApiResultStatusCode.cs
+++ b/Brizco.Common/Models/Api/ApiResultStatusCode.cs
@@ -1,5 +1,4 @@
-using System.ComponentModel.DataAnnotations;
-using System.Net;
+using System.Net;
 
 namespace Brizco.Common.Models.Api
 {
diff --git a/Brizco.Common/Models/Entity/ApiEntity.cs b/Brizco.Common/Models/Entity/ApiEntity.cs
index 31e667b..c8f4a11 100644
--- a/Brizco.Common/Models/Entity/ApiEntity.cs
+++ b/Brizco.Common/Models/Entity/ApiEntity.cs
@@ -1,6 +1,4 @@
-using Microsoft.VisualBasic.CompilerServices;
-
-namespace Brizco.Common.Models.Entity;
+namespace Brizco.Common.Models.Entity;
 public abstract class ApiEntity : IApiEntity , IEquatable<ApiEntity>
 {
     [Key]
diff --git a/Brizco.Core/Brizco.Core.csproj b/Brizco.Core/Brizco.Core.csproj
index 8517ffd..1cb8daa 100644
--- a/Brizco.Core/Brizco.Core.csproj
+++ b/Brizco.Core/Brizco.Core.csproj
@@ -17,6 +17,7 @@
 	</ItemGroup>
 
   <ItemGroup>
+    <Folder Include="EntityServices\Handlers\Complexes\" />
     <Folder Include="Models\Api\" />
     <Folder Include="QuartzServices\Commands\" />
   </ItemGroup>
@@ -35,6 +36,7 @@
     <Using Include="Brizco.Core.CoreServices.Abstracts" />
     <Using Include="Brizco.Core.CoreServices.ReportServices.Commands" />
     <Using Include="Brizco.Core.EntityServices.Abstracts" />
+    <Using Include="Brizco.Core.EntityServices.CommandQueries" />
     <Using Include="Brizco.Core.MartenServices.Abstracts" />
     <Using Include="Brizco.Core.QuartzServices.Commands" />
     <Using Include="Brizco.Domain" />
diff --git a/Brizco.Core/CoreServices/Abstracts/IJwtService.cs b/Brizco.Core/CoreServices/Abstracts/IJwtService.cs
index 5adb635..042cf3b 100644
--- a/Brizco.Core/CoreServices/Abstracts/IJwtService.cs
+++ b/Brizco.Core/CoreServices/Abstracts/IJwtService.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Users;
-
-namespace Brizco.Core.CoreServices.Abstracts;
+namespace Brizco.Core.CoreServices.Abstracts;
 
 public interface IJwtService : IScopedDependency
 {
diff --git a/Brizco.Core/CoreServices/AccountService.cs b/Brizco.Core/CoreServices/AccountService.cs
index 7165787..63e0f84 100644
--- a/Brizco.Core/CoreServices/AccountService.cs
+++ b/Brizco.Core/CoreServices/AccountService.cs
@@ -1,10 +1,4 @@
-using System.Threading;
-using Brizco.Domain.Entities.Complexes;
-using Brizco.Domain.Entities.ShiftPlans;
-using Brizco.Domain.Entities.Users;
-using NPOI.SS.Formula.Functions;
-
-namespace Brizco.Core.CoreServices;
+namespace Brizco.Core.CoreServices;
 
 public class AccountService(
     UserManager<ApplicationUser> userManager,
diff --git a/Brizco.Core/CoreServices/JwtService.cs b/Brizco.Core/CoreServices/JwtService.cs
index c3b0e5d..8e88752 100644
--- a/Brizco.Core/CoreServices/JwtService.cs
+++ b/Brizco.Core/CoreServices/JwtService.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.Options;
 using System.IdentityModel.Tokens.Jwt;
 using System.Text;
-using Brizco.Domain.Entities.Users;
 
 namespace Brizco.Core.CoreServices;
 
diff --git a/Brizco.Core/CoreServices/ReportServices/ShiftPlanReportCommandHandler.cs b/Brizco.Core/CoreServices/ReportServices/ShiftPlanReportCommandHandler.cs
index 4f01704..cb1dd1f 100644
--- a/Brizco.Core/CoreServices/ReportServices/ShiftPlanReportCommandHandler.cs
+++ b/Brizco.Core/CoreServices/ReportServices/ShiftPlanReportCommandHandler.cs
@@ -1,5 +1,4 @@
-using Brizco.Domain.Entities.Shifts;
-using Brizco.Domain.Entities.Tasks;
+using Brizco.Domain.Entities.Tasks;
 using MD.PersianDateTime.Standard;
 
 namespace Brizco.Core.CoreServices.ReportServices;
diff --git a/Brizco.Core/EntityServices/Abstracts/IComplexService.cs b/Brizco.Core/EntityServices/Abstracts/IComplexService.cs
deleted file mode 100644
index 3ff2393..0000000
--- a/Brizco.Core/EntityServices/Abstracts/IComplexService.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Brizco.Core.EntityServices.Abstracts;
-
-public interface IComplexService : IScopedDependency
-{
-    Task<ComplexSDto> CreateComplexAsync(string complexName,
-        string complexAddress,
-        string complexSuppPhone,
-        Guid managerUserId,
-        CancellationToken cancellationToken);
-}
\ No newline at end of file
diff --git a/Brizco.Core/EntityServices/Abstracts/IUserService.cs b/Brizco.Core/EntityServices/Abstracts/IUserService.cs
index c67a781..1a7d040 100644
--- a/Brizco.Core/EntityServices/Abstracts/IUserService.cs
+++ b/Brizco.Core/EntityServices/Abstracts/IUserService.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Users;
-
-namespace Brizco.Core.EntityServices.Abstracts;
+namespace Brizco.Core.EntityServices.Abstracts;
 
 public interface IUserService : IScopedDependency
 {
diff --git a/Brizco.Core/EntityServices/CommandQueries/ComplexCommands.cs b/Brizco.Core/EntityServices/CommandQueries/ComplexCommands.cs
new file mode 100644
index 0000000..e9030e2
--- /dev/null
+++ b/Brizco.Core/EntityServices/CommandQueries/ComplexCommands.cs
@@ -0,0 +1,7 @@
+namespace Brizco.Core.EntityServices.CommandQueries;
+
+public sealed record CreateComplexCoreCommand(
+    string Name,
+    string Address,
+    string SupportPhone,
+    Guid ManagerUserId ) : IRequest<ComplexSDto>;
\ No newline at end of file
diff --git a/Brizco.Core/EntityServices/ComplexService.cs b/Brizco.Core/EntityServices/Handlers/Complexes/CreateComplexCoreCommandHandler.cs
similarity index 83%
rename from Brizco.Core/EntityServices/ComplexService.cs
rename to Brizco.Core/EntityServices/Handlers/Complexes/CreateComplexCoreCommandHandler.cs
index 2ab5932..775c534 100644
--- a/Brizco.Core/EntityServices/ComplexService.cs
+++ b/Brizco.Core/EntityServices/Handlers/Complexes/CreateComplexCoreCommandHandler.cs
@@ -1,19 +1,12 @@
-using Brizco.Domain.Entities.Users;
+namespace Brizco.Core.EntityServices.Handlers.Complexes;
 
-namespace Brizco.Core.EntityServices;
-
-public class ComplexService(ISender sender, RoleManager<ApplicationRole> roleManager) : IComplexService
+public class CreateComplexCoreCommandHandler(ISender sender, RoleManager<ApplicationRole> roleManager) : IRequestHandler<CreateComplexCoreCommand , ComplexSDto>
 {
-    public async Task<ComplexSDto> CreateComplexAsync(string complexName,
-        string complexAddress,
-        string complexSuppPhone,
-        Guid managerUserId,
-        CancellationToken cancellationToken)
+    public async Task<ComplexSDto> Handle(CreateComplexCoreCommand request, CancellationToken cancellationToken)
     {
-
-        var complex = await sender.Send(new CreateComplexCommand(complexName,
-            complexAddress,
-            complexSuppPhone));
+        var complex = await sender.Send(new CreateComplexCommand(request.Name,
+            request.Address,
+            request.SupportPhone), cancellationToken);
 
         var managerRole = new ApplicationRole
         {
@@ -79,7 +72,7 @@ public class ComplexService(ISender sender, RoleManager<ApplicationRole> roleMan
             await roleManager.AddClaimAsync(staffRole, claim);
 
 
-        var complexUser = await sender.Send(new CreateComplexUserCommand(complex.Id, managerUserId, new List<Guid>{ managerRole.Id }), cancellationToken);
+        var complexUser = await sender.Send(new CreateComplexUserCommand(complex.Id, request.ManagerUserId, new List<Guid> { managerRole.Id }), cancellationToken);
 
         return complex;
     }
diff --git a/Brizco.Core/EntityServices/UserService.cs b/Brizco.Core/EntityServices/UserService.cs
index 0e3eb0f..f24b46e 100644
--- a/Brizco.Core/EntityServices/UserService.cs
+++ b/Brizco.Core/EntityServices/UserService.cs
@@ -1,7 +1,4 @@
-using Brizco.Domain.Entities.Complexes;
-using Brizco.Domain.Entities.Users;
-
-namespace Brizco.Core.EntityServices;
+namespace Brizco.Core.EntityServices;
 
 public class UserService(
     ICurrentUserService currentUserService,
diff --git a/Brizco.Core/Models/Api/ApiResult.cs b/Brizco.Core/Models/Api/ApiResult.cs
index e249045..419ff02 100644
--- a/Brizco.Core/Models/Api/ApiResult.cs
+++ b/Brizco.Core/Models/Api/ApiResult.cs
@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
 
 namespace Brizco.Core.Models.Api;
 
diff --git a/Brizco.Domain/CommandQueries/Commands/ActivityCommands.cs b/Brizco.Domain/CommandQueries/Commands/ActivityCommands.cs
index a486158..505ebe2 100644
--- a/Brizco.Domain/CommandQueries/Commands/ActivityCommands.cs
+++ b/Brizco.Domain/CommandQueries/Commands/ActivityCommands.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Dtos.LargeDtos;
-
-namespace Brizco.Domain.CommandQueries.Commands;
+namespace Brizco.Domain.CommandQueries.Commands;
 
 public sealed record CreateActivityCommand(
     TaskType Type,
diff --git a/Brizco.Domain/CommandQueries/Commands/ShiftPlanCommands.cs b/Brizco.Domain/CommandQueries/Commands/ShiftPlanCommands.cs
index 81f7a76..69e38f0 100644
--- a/Brizco.Domain/CommandQueries/Commands/ShiftPlanCommands.cs
+++ b/Brizco.Domain/CommandQueries/Commands/ShiftPlanCommands.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Dtos.LargeDtos;
-
-namespace Brizco.Domain.CommandQueries.Commands;
+namespace Brizco.Domain.CommandQueries.Commands;
 
 public record CreateShiftPlanCommand(long PlanDate,Guid ShiftId,Guid RoutineId,Guid SupervisionUserId, List<KeyValuePair<Guid,Guid>> UserAndPositionIds)
     :IRequest<ShiftPlanLDto>;
diff --git a/Brizco.Domain/CommandQueries/Commands/TaskCommands.cs b/Brizco.Domain/CommandQueries/Commands/TaskCommands.cs
index 1fa76df..ca7baa9 100644
--- a/Brizco.Domain/CommandQueries/Commands/TaskCommands.cs
+++ b/Brizco.Domain/CommandQueries/Commands/TaskCommands.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Dtos.LargeDtos;
-
-namespace Brizco.Domain.CommandQueries.Commands;
+namespace Brizco.Domain.CommandQueries.Commands;
 
 public sealed record CreateTaskCommand(TaskType Type,
 string Title,
diff --git a/Brizco.Domain/CommandQueries/Queries/ActivityQueries.cs b/Brizco.Domain/CommandQueries/Queries/ActivityQueries.cs
index 61a61eb..5a6cbb8 100644
--- a/Brizco.Domain/CommandQueries/Queries/ActivityQueries.cs
+++ b/Brizco.Domain/CommandQueries/Queries/ActivityQueries.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Dtos.LargeDtos;
-
-namespace Brizco.Domain.CommandQueries.Queries;
+namespace Brizco.Domain.CommandQueries.Queries;
 
 public sealed record GetActivitiesQuery(int Page = 0 , 
     long SelectedDate = 0 , 
diff --git a/Brizco.Domain/CommandQueries/Queries/PositionQueries.cs b/Brizco.Domain/CommandQueries/Queries/PositionQueries.cs
index b51cae0..f651b30 100644
--- a/Brizco.Domain/CommandQueries/Queries/PositionQueries.cs
+++ b/Brizco.Domain/CommandQueries/Queries/PositionQueries.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Dtos.LargeDtos;
-
-namespace Brizco.Domain.CommandQueries.Queries;
+namespace Brizco.Domain.CommandQueries.Queries;
 
 public sealed record GetPositionsQuery(int Page = 0) :
     IRequest<List<PositionSDto>>;
diff --git a/Brizco.Domain/CommandQueries/Queries/SectionQueries.cs b/Brizco.Domain/CommandQueries/Queries/SectionQueries.cs
index 91f7794..612258e 100644
--- a/Brizco.Domain/CommandQueries/Queries/SectionQueries.cs
+++ b/Brizco.Domain/CommandQueries/Queries/SectionQueries.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Dtos.LargeDtos;
-
-namespace Brizco.Domain.CommandQueries.Queries;
+namespace Brizco.Domain.CommandQueries.Queries;
 
 public sealed record GetSectionsQuery(int Page = 0) :
     IRequest<List<SectionSDto>>;
diff --git a/Brizco.Domain/CommandQueries/Queries/ShiftPlanQueries.cs b/Brizco.Domain/CommandQueries/Queries/ShiftPlanQueries.cs
index e71b14b..1b31a39 100644
--- a/Brizco.Domain/CommandQueries/Queries/ShiftPlanQueries.cs
+++ b/Brizco.Domain/CommandQueries/Queries/ShiftPlanQueries.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Dtos.LargeDtos;
-
-namespace Brizco.Domain.CommandQueries.Queries;
+namespace Brizco.Domain.CommandQueries.Queries;
 
 public sealed record GetShiftPlansQuery(int Page = 0 , long SelectedDate = 0 , DateTimeQueryFilter? DateTimeQueryFilter = DateTimeQueryFilter.CustomDate) :
     IRequest<List<ShiftPlanSDto>>;
diff --git a/Brizco.Domain/CommandQueries/Queries/ShiftQueries.cs b/Brizco.Domain/CommandQueries/Queries/ShiftQueries.cs
index a56a319..77da97d 100644
--- a/Brizco.Domain/CommandQueries/Queries/ShiftQueries.cs
+++ b/Brizco.Domain/CommandQueries/Queries/ShiftQueries.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Dtos.LargeDtos;
-
-namespace Brizco.Domain.CommandQueries.Queries;
+namespace Brizco.Domain.CommandQueries.Queries;
 
 public sealed record GetShiftsQuery(int Page = 0,long SelectedDate = 0) : 
     IRequest<List<ShiftSDto>>;
diff --git a/Brizco.Domain/CommandQueries/Queries/TaskQueries.cs b/Brizco.Domain/CommandQueries/Queries/TaskQueries.cs
index 5572bce..3ce340e 100644
--- a/Brizco.Domain/CommandQueries/Queries/TaskQueries.cs
+++ b/Brizco.Domain/CommandQueries/Queries/TaskQueries.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Dtos.LargeDtos;
-
-namespace Brizco.Domain.CommandQueries.Queries;
+namespace Brizco.Domain.CommandQueries.Queries;
 
 public sealed record GetTasksQuery(int Page = 0 , int? Count = null,Guid? ShiftId = null) : 
     IRequest<List<TaskSDto>>;
diff --git a/Brizco.Domain/Dtos/LargeDtos/ComplexLDto.cs b/Brizco.Domain/Dtos/LargeDtos/ComplexLDto.cs
index 7591244..0fb65cd 100644
--- a/Brizco.Domain/Dtos/LargeDtos/ComplexLDto.cs
+++ b/Brizco.Domain/Dtos/LargeDtos/ComplexLDto.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Complexes;
-
-namespace Brizco.Domain.Dtos.LargeDtos;
+namespace Brizco.Domain.Dtos.LargeDtos;
 
 public class ComplexLDto : BaseDto<ComplexLDto,Complex>
 {
diff --git a/Brizco.Domain/Dtos/LargeDtos/PositionLDto.cs b/Brizco.Domain/Dtos/LargeDtos/PositionLDto.cs
index 67d25ea..9562efa 100644
--- a/Brizco.Domain/Dtos/LargeDtos/PositionLDto.cs
+++ b/Brizco.Domain/Dtos/LargeDtos/PositionLDto.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Complexes;
-
-namespace Brizco.Domain.Dtos.LargeDtos;
+namespace Brizco.Domain.Dtos.LargeDtos;
 
 public class PositionLDto : BaseDto<PositionLDto, Position>
 {
diff --git a/Brizco.Domain/Dtos/LargeDtos/SectionLDto.cs b/Brizco.Domain/Dtos/LargeDtos/SectionLDto.cs
index 05a370b..712e8e4 100644
--- a/Brizco.Domain/Dtos/LargeDtos/SectionLDto.cs
+++ b/Brizco.Domain/Dtos/LargeDtos/SectionLDto.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Complexes;
-
-namespace Brizco.Domain.Dtos.LargeDtos;
+namespace Brizco.Domain.Dtos.LargeDtos;
 
 public class SectionLDto : BaseDto<SectionLDto, Section>
 {
diff --git a/Brizco.Domain/Dtos/LargeDtos/ShiftLDto.cs b/Brizco.Domain/Dtos/LargeDtos/ShiftLDto.cs
index ee61854..d503c99 100644
--- a/Brizco.Domain/Dtos/LargeDtos/ShiftLDto.cs
+++ b/Brizco.Domain/Dtos/LargeDtos/ShiftLDto.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Shifts;
-
-namespace Brizco.Domain.Dtos.LargeDtos;
+namespace Brizco.Domain.Dtos.LargeDtos;
 
 public class ShiftLDto : BaseDto<ShiftLDto,Shift>
 {
diff --git a/Brizco.Domain/Dtos/LargeDtos/ShiftPlanLDto.cs b/Brizco.Domain/Dtos/LargeDtos/ShiftPlanLDto.cs
index b6d6746..10bf32f 100644
--- a/Brizco.Domain/Dtos/LargeDtos/ShiftPlanLDto.cs
+++ b/Brizco.Domain/Dtos/LargeDtos/ShiftPlanLDto.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Shifts;
-
-namespace Brizco.Domain.Dtos.LargeDtos;
+namespace Brizco.Domain.Dtos.LargeDtos;
 
 public class ShiftPlanLDto : BaseDto<ShiftPlanLDto , ShiftPlan>
 {
diff --git a/Brizco.Domain/Dtos/ResponseDto/ProfileResponseDto.cs b/Brizco.Domain/Dtos/ResponseDto/ProfileResponseDto.cs
index 4ae705c..80863ec 100644
--- a/Brizco.Domain/Dtos/ResponseDto/ProfileResponseDto.cs
+++ b/Brizco.Domain/Dtos/ResponseDto/ProfileResponseDto.cs
@@ -1,6 +1,4 @@
-using Brizco.Common.Models.Api;
-
-namespace Brizco.Domain.Dtos.ResponseDto;
+namespace Brizco.Domain.Dtos.ResponseDto;
 
 public class ProfileResponseDto
 {
diff --git a/Brizco.Domain/Dtos/SmallDtos/ApplicationUserSDto.cs b/Brizco.Domain/Dtos/SmallDtos/ApplicationUserSDto.cs
index b5d8d6f..9d501b5 100644
--- a/Brizco.Domain/Dtos/SmallDtos/ApplicationUserSDto.cs
+++ b/Brizco.Domain/Dtos/SmallDtos/ApplicationUserSDto.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Users;
-
-namespace Brizco.Domain.Dtos.SmallDtos;
+namespace Brizco.Domain.Dtos.SmallDtos;
 
 public class ApplicationUserSDto : BaseDto<ApplicationUserSDto,ApplicationUser>
 {
diff --git a/Brizco.Domain/Dtos/SmallDtos/ComplexSDto.cs b/Brizco.Domain/Dtos/SmallDtos/ComplexSDto.cs
index 2e2446d..3daa6a1 100644
--- a/Brizco.Domain/Dtos/SmallDtos/ComplexSDto.cs
+++ b/Brizco.Domain/Dtos/SmallDtos/ComplexSDto.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Complexes;
-
-namespace Brizco.Domain.Dtos.SmallDtos;
+namespace Brizco.Domain.Dtos.SmallDtos;
 
 public class ComplexSDto : BaseDto<ComplexSDto, Complex>
 {
diff --git a/Brizco.Domain/Dtos/SmallDtos/ComplexUserRoleSDto.cs b/Brizco.Domain/Dtos/SmallDtos/ComplexUserRoleSDto.cs
index 3e64cb8..557e1d8 100644
--- a/Brizco.Domain/Dtos/SmallDtos/ComplexUserRoleSDto.cs
+++ b/Brizco.Domain/Dtos/SmallDtos/ComplexUserRoleSDto.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Complexes;
-
-namespace Brizco.Domain.Dtos.SmallDtos;
+namespace Brizco.Domain.Dtos.SmallDtos;
 
 public class ComplexUserRoleSDto : BaseDto<ComplexUserRoleSDto,ComplexUserRole>
 {
diff --git a/Brizco.Domain/Dtos/SmallDtos/ComplexUserSDto.cs b/Brizco.Domain/Dtos/SmallDtos/ComplexUserSDto.cs
index cd615fa..69a452e 100644
--- a/Brizco.Domain/Dtos/SmallDtos/ComplexUserSDto.cs
+++ b/Brizco.Domain/Dtos/SmallDtos/ComplexUserSDto.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Complexes;
-
-namespace Brizco.Domain.Dtos.SmallDtos;
+namespace Brizco.Domain.Dtos.SmallDtos;
 
 public class ComplexUserSDto : BaseDto<ComplexUserSDto,ComplexUser>
 {
diff --git a/Brizco.Domain/Dtos/SmallDtos/PositionSDto.cs b/Brizco.Domain/Dtos/SmallDtos/PositionSDto.cs
index 255f4d8..70b343c 100644
--- a/Brizco.Domain/Dtos/SmallDtos/PositionSDto.cs
+++ b/Brizco.Domain/Dtos/SmallDtos/PositionSDto.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Complexes;
-
-namespace Brizco.Domain.Dtos.SmallDtos;
+namespace Brizco.Domain.Dtos.SmallDtos;
 
 public class PositionSDto : BaseDto<PositionSDto, Position>
 {
diff --git a/Brizco.Domain/Dtos/SmallDtos/RoutineSDto.cs b/Brizco.Domain/Dtos/SmallDtos/RoutineSDto.cs
index 8d54782..863d389 100644
--- a/Brizco.Domain/Dtos/SmallDtos/RoutineSDto.cs
+++ b/Brizco.Domain/Dtos/SmallDtos/RoutineSDto.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Routines;
-
-namespace Brizco.Domain.Dtos.SmallDtos;
+namespace Brizco.Domain.Dtos.SmallDtos;
 
 public class RoutineSDto : BaseDto<RoutineSDto,Routine>
 {
diff --git a/Brizco.Domain/Dtos/SmallDtos/SectionSDto.cs b/Brizco.Domain/Dtos/SmallDtos/SectionSDto.cs
index 1d1c746..da12239 100644
--- a/Brizco.Domain/Dtos/SmallDtos/SectionSDto.cs
+++ b/Brizco.Domain/Dtos/SmallDtos/SectionSDto.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Complexes;
-
-namespace Brizco.Domain.Dtos.SmallDtos;
+namespace Brizco.Domain.Dtos.SmallDtos;
 
 public class SectionSDto :  BaseDto<SectionSDto, Section>
 {
diff --git a/Brizco.Domain/Dtos/SmallDtos/ShiftDaySDto.cs b/Brizco.Domain/Dtos/SmallDtos/ShiftDaySDto.cs
index f0c4668..ff2b1f3 100644
--- a/Brizco.Domain/Dtos/SmallDtos/ShiftDaySDto.cs
+++ b/Brizco.Domain/Dtos/SmallDtos/ShiftDaySDto.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Shifts;
-
-namespace Brizco.Domain.Dtos.SmallDtos;
+namespace Brizco.Domain.Dtos.SmallDtos;
 
 public class ShiftDaySDto : BaseDto<ShiftDaySDto,ShiftDay>
 {
diff --git a/Brizco.Domain/Dtos/SmallDtos/ShiftPlanSDto.cs b/Brizco.Domain/Dtos/SmallDtos/ShiftPlanSDto.cs
index 44d9add..7beb461 100644
--- a/Brizco.Domain/Dtos/SmallDtos/ShiftPlanSDto.cs
+++ b/Brizco.Domain/Dtos/SmallDtos/ShiftPlanSDto.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Shifts;
-
-namespace Brizco.Domain.Dtos.SmallDtos;
+namespace Brizco.Domain.Dtos.SmallDtos;
 
 public class ShiftPlanSDto : BaseDto<ShiftPlanSDto,ShiftPlan>
 {
diff --git a/Brizco.Domain/Dtos/SmallDtos/ShiftPlanUserSDto.cs b/Brizco.Domain/Dtos/SmallDtos/ShiftPlanUserSDto.cs
index 63da2a8..800bff1 100644
--- a/Brizco.Domain/Dtos/SmallDtos/ShiftPlanUserSDto.cs
+++ b/Brizco.Domain/Dtos/SmallDtos/ShiftPlanUserSDto.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.ShiftPlans;
-
-namespace Brizco.Domain.Dtos.SmallDtos;
+namespace Brizco.Domain.Dtos.SmallDtos;
 
 public class ShiftPlanUserSDto : BaseDto<ShiftPlanUserSDto,ShiftPlanUser>
 {
diff --git a/Brizco.Domain/Dtos/SmallDtos/ShiftRoutineSDto.cs b/Brizco.Domain/Dtos/SmallDtos/ShiftRoutineSDto.cs
index 6deda54..d68393c 100644
--- a/Brizco.Domain/Dtos/SmallDtos/ShiftRoutineSDto.cs
+++ b/Brizco.Domain/Dtos/SmallDtos/ShiftRoutineSDto.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Shifts;
-
-namespace Brizco.Domain.Dtos.SmallDtos;
+namespace Brizco.Domain.Dtos.SmallDtos;
 
 public class ShiftRoutineSDto : BaseDto<ShiftRoutineSDto, ShiftRoutine>
 {
diff --git a/Brizco.Domain/Dtos/SmallDtos/ShiftSDto.cs b/Brizco.Domain/Dtos/SmallDtos/ShiftSDto.cs
index a8a6469..d461f8b 100644
--- a/Brizco.Domain/Dtos/SmallDtos/ShiftSDto.cs
+++ b/Brizco.Domain/Dtos/SmallDtos/ShiftSDto.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Shifts;
-
-namespace Brizco.Domain.Dtos.SmallDtos;
+namespace Brizco.Domain.Dtos.SmallDtos;
 public class ShiftSDto : BaseDto<ShiftSDto,Shift>
 {
     public string Title { get; set; } = string.Empty;
diff --git a/Brizco.Domain/Entities/Complexes/Complex.cs b/Brizco.Domain/Entities/Complexes/Complex.cs
index 0690304..1ea9d3c 100644
--- a/Brizco.Domain/Entities/Complexes/Complex.cs
+++ b/Brizco.Domain/Entities/Complexes/Complex.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Shifts;
-using Brizco.Domain.Entities.Users;
-using Task = Brizco.Domain.Entities.Tasks.Task;
+using Task = Brizco.Domain.Entities.Tasks.Task;
 
 namespace Brizco.Domain.Entities.Complexes;
 
diff --git a/Brizco.Domain/Entities/Complexes/ComplexUser.cs b/Brizco.Domain/Entities/Complexes/ComplexUser.cs
index 7c34617..6fb4a28 100644
--- a/Brizco.Domain/Entities/Complexes/ComplexUser.cs
+++ b/Brizco.Domain/Entities/Complexes/ComplexUser.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Users;
-
-namespace Brizco.Domain.Entities.Complexes;
+namespace Brizco.Domain.Entities.Complexes;
 [AdaptTwoWays("[name]SDto", IgnoreAttributes = new[] { typeof(AdaptIgnoreAttribute) }, MapType = MapType.Map | MapType.MapToTarget | MapType.Projection)]
 [GenerateMapper]
 public partial class ComplexUser : ApiEntity
diff --git a/Brizco.Domain/Entities/Complexes/ComplexUserRole.cs b/Brizco.Domain/Entities/Complexes/ComplexUserRole.cs
index 4616a6a..5323494 100644
--- a/Brizco.Domain/Entities/Complexes/ComplexUserRole.cs
+++ b/Brizco.Domain/Entities/Complexes/ComplexUserRole.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Users;
-
-namespace Brizco.Domain.Entities.Complexes;
+namespace Brizco.Domain.Entities.Complexes;
 [AdaptTwoWays("[name]SDto", IgnoreAttributes = new[] { typeof(AdaptIgnoreAttribute) }, MapType = MapType.Map | MapType.MapToTarget | MapType.Projection)]
 [GenerateMapper]
 public class ComplexUserRole : ApiEntity
diff --git a/Brizco.Domain/Entities/Routines/Aggregate.Routine.cs b/Brizco.Domain/Entities/Routines/Aggregate.Routine.cs
index e86298b..8c6a639 100644
--- a/Brizco.Domain/Entities/Routines/Aggregate.Routine.cs
+++ b/Brizco.Domain/Entities/Routines/Aggregate.Routine.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Shifts;
-
-namespace Brizco.Domain.Entities.Routines;
+namespace Brizco.Domain.Entities.Routines;
 
 public partial class Routine
 {
diff --git a/Brizco.Domain/Entities/Routines/Routine.cs b/Brizco.Domain/Entities/Routines/Routine.cs
index 3ee8f54..9f4b9d5 100644
--- a/Brizco.Domain/Entities/Routines/Routine.cs
+++ b/Brizco.Domain/Entities/Routines/Routine.cs
@@ -1,5 +1,4 @@
-using Brizco.Domain.Entities.Shifts;
-using Brizco.Domain.Entities.Tasks;
+using Brizco.Domain.Entities.Tasks;
 
 namespace Brizco.Domain.Entities.Routines;
 
diff --git a/Brizco.Domain/Entities/Shifts/ShiftRoutine.cs b/Brizco.Domain/Entities/Shifts/ShiftRoutine.cs
index 14f7087..427bf49 100644
--- a/Brizco.Domain/Entities/Shifts/ShiftRoutine.cs
+++ b/Brizco.Domain/Entities/Shifts/ShiftRoutine.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Routines;
-
-namespace Brizco.Domain.Entities.Shifts;
+namespace Brizco.Domain.Entities.Shifts;
 
 [AdaptTwoWays("[name]SDto", IgnoreAttributes = new[] { typeof(AdaptIgnoreAttribute) }, MapType = MapType.Map | MapType.MapToTarget | MapType.Projection)]
 [GenerateMapper]
diff --git a/Brizco.Domain/Entities/Tasks/TaskRoutine.cs b/Brizco.Domain/Entities/Tasks/TaskRoutine.cs
index 49c2d41..544bd70 100644
--- a/Brizco.Domain/Entities/Tasks/TaskRoutine.cs
+++ b/Brizco.Domain/Entities/Tasks/TaskRoutine.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.Entities.Routines;
-
-namespace Brizco.Domain.Entities.Tasks;
+namespace Brizco.Domain.Entities.Tasks;
 
 [AdaptTwoWays("[name]SDto", IgnoreAttributes = new[] { typeof(AdaptIgnoreAttribute) }, MapType = MapType.Map | MapType.MapToTarget | MapType.Projection)]
 [GenerateMapper]
diff --git a/Brizco.Repository/MartenHandlers/Notifications/ReadNotificationCommandHandler.cs b/Brizco.Repository/MartenHandlers/Notifications/ReadNotificationCommandHandler.cs
index 86b2f13..ccd7313 100644
--- a/Brizco.Repository/MartenHandlers/Notifications/ReadNotificationCommandHandler.cs
+++ b/Brizco.Repository/MartenHandlers/Notifications/ReadNotificationCommandHandler.cs
@@ -1,6 +1,4 @@
-using Brizco.Domain.MartenEntities.Notifications;
-
-namespace Brizco.Repository.MartenHandlers.Notifications;
+namespace Brizco.Repository.MartenHandlers.Notifications;
 
 public class ReadNotificationCommandHandler(IMartenRepositoryWrapper martenRepositoryWrapper, ICurrentUserService currentUserService) : IRequestHandler<ReadNotificationCommand, bool>
 {