diff --git a/DI/XDIHelperExtension.cs b/DI/XDIHelperExtension.cs
index 87eaf59..3e9d9a4 100644
--- a/DI/XDIHelperExtension.cs
+++ b/DI/XDIHelperExtension.cs
@@ -1,25 +1,25 @@
 using System;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
-using xAiModels.Providers.Dtos;
-using xAiModels.Providers.Entities;
-using xCommons.Extensions;
-using xDataService.Constants;
 using xDataService.Db;
-using xDataService.Models;
-using xExceptions.Constants;
-using xPushService.Helpers;
 using xPushService.DI;
 using xDataService.DI;
-using xAiModels.Interfaces.Dtos;
-using xAiModels.Helpers;
 using xCommons.Helpers;
-using xAiModels.Interfaces.Entities;
-using xAiModels.Interfaces;
+using xAiModels.Helpers;
+using xDataService.Models;
 using xAiModels.Providers;
 using xAiModels.Constants;
-using xAiModels.Interfaces.Enrichers;
+using xCommons.Extensions;
+using xPushService.Helpers;
+using xAiModels.Interfaces;
+using xExceptions.Constants;
+using xDataService.Constants;
+using xAiModels.Providers.Dtos;
+using xAiModels.Interfaces.Dtos;
+using Microsoft.AspNetCore.Builder;
+using xAiModels.Providers.Entities;
+using xAiModels.Interfaces.Entities;
 using xAiModels.Providers.Enrichers;
+using xAiModels.Interfaces.Enrichers;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace xAiModels.DI
 {
diff --git a/Interfaces/Dtos/IXAiMessageRepositoryService.cs b/Interfaces/Dtos/IXAiMessageRepositoryService.cs
index cda0050..d893730 100644
--- a/Interfaces/Dtos/IXAiMessageRepositoryService.cs
+++ b/Interfaces/Dtos/IXAiMessageRepositoryService.cs
@@ -1,10 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Threading;
-using System.Threading.Tasks;
 using xAiModels.Models.Dtos;
-using xAiModels.Models.Entities;
+using System.Threading.Tasks;
 using xDataService.Interfaces;
+using xAiModels.Models.Entities;
+using System.Collections.Generic;
 
 namespace xAiModels.Interfaces.Dtos
 {
diff --git a/Interfaces/Enrichers/IXAiConversationEnricher.cs b/Interfaces/Enrichers/IXAiConversationEnricher.cs
index 7f9a6c5..d815c5f 100644
--- a/Interfaces/Enrichers/IXAiConversationEnricher.cs
+++ b/Interfaces/Enrichers/IXAiConversationEnricher.cs
@@ -1,8 +1,8 @@
-using System.Collections.Generic;
 using System.Threading;
-using System.Threading.Tasks;
 using xAiModels.Models.Dtos;
+using System.Threading.Tasks;
 using xAiModels.Models.Entities;
+using System.Collections.Generic;
 
 namespace xAiModels.Interfaces.Enrichers
 {
diff --git a/Providers/Dtos/XAiConversationRepositoryService.cs b/Providers/Dtos/XAiConversationRepositoryService.cs
index c3cc359..bc0e024 100644
--- a/Providers/Dtos/XAiConversationRepositoryService.cs
+++ b/Providers/Dtos/XAiConversationRepositoryService.cs
@@ -1,19 +1,19 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
+using xModels.Dtos;
 using System.Threading;
+using xCommons.Extensions;
+using xAiModels.Interfaces;
+using xAiModels.Models.Dtos;
 using System.Threading.Tasks;
+using xDataService.Providers;
 using xAiModels.Configurations;
 using xAiModels.Interfaces.Dtos;
-using xAiModels.Interfaces.Entities;
-using xAiModels.Models.Dtos;
 using xAiModels.Models.Entities;
-using xCommons.Extensions;
-using xDataService.Providers;
+using System.Collections.Generic;
 using xIdentityService.Interfaces;
 using xIdentityService.Extensions;
-using xModels.Dtos;
-using xAiModels.Interfaces;
+using xAiModels.Interfaces.Entities;
 
 namespace xAiModels.Providers.Dtos
 {
diff --git a/Providers/Dtos/XAiMessageRepositoryService.cs b/Providers/Dtos/XAiMessageRepositoryService.cs
index 5636a5a..feb5611 100644
--- a/Providers/Dtos/XAiMessageRepositoryService.cs
+++ b/Providers/Dtos/XAiMessageRepositoryService.cs
@@ -1,19 +1,19 @@
 using System;
-using System.Collections.Generic;
+using System.Linq;
+using xModels.Dtos;
 using System.Threading;
+using xCommons.Extensions;
+using xAiModels.Interfaces;
+using xAiModels.Models.Dtos;
 using System.Threading.Tasks;
+using xDataService.Providers;
 using xAiModels.Configurations;
 using xAiModels.Interfaces.Dtos;
-using xAiModels.Interfaces.Entities;
-using xAiModels.Models.Dtos;
 using xAiModels.Models.Entities;
-using xCommons.Extensions;
-using xDataService.Providers;
+using System.Collections.Generic;
 using xIdentityService.Interfaces;
-using xModels.Dtos;
 using xIdentityService.Extensions;
-using xAiModels.Interfaces;
-using System.Linq;
+using xAiModels.Interfaces.Entities;
 
 namespace xAiModels.Providers.Dtos
 {
diff --git a/Providers/Enrichers/XAiConversationEnricher.cs b/Providers/Enrichers/XAiConversationEnricher.cs
index d0441f7..9293f52 100644
--- a/Providers/Enrichers/XAiConversationEnricher.cs
+++ b/Providers/Enrichers/XAiConversationEnricher.cs
@@ -1,16 +1,16 @@
-using System.Collections.Generic;
 using System.Linq;
+using xModels.Dtos;
 using System.Threading;
-using System.Threading.Tasks;
-using xAiModels.Interfaces;
-using xAiModels.Interfaces.Enrichers;
-using xAiModels.Interfaces.Entities;
-using xAiModels.Models.Dtos;
-using xAiModels.Models.Entities;
 using xCommons.Extensions;
+using xAiModels.Interfaces;
+using xAiModels.Models.Dtos;
+using System.Threading.Tasks;
+using xAiModels.Models.Entities;
+using System.Collections.Generic;
 using xIdentityService.Interfaces;
 using xIdentityService.Extensions;
-using xModels.Dtos;
+using xAiModels.Interfaces.Entities;
+using xAiModels.Interfaces.Enrichers;
 
 namespace xAiModels.Providers.Enrichers
 {
diff --git a/Providers/XAiConversationTitleResourceProvider.cs b/Providers/XAiConversationTitleResourceProvider.cs
index 5879eab..3a56814 100644
--- a/Providers/XAiConversationTitleResourceProvider.cs
+++ b/Providers/XAiConversationTitleResourceProvider.cs
@@ -1,8 +1,8 @@
 using xAiModels.Constants;
 using xAiModels.Interfaces;
 using xCommons.Configurations;
-using xStringService.Interfaces.Dtos;
 using xStringService.Providers;
+using xStringService.Interfaces.Dtos;
 
 namespace xAiModels.Providers
 {