diff --git a/Base/XBaseDtoHub.cs b/Base/XBaseDtoHub.cs
index 2c43ab9..7e33c59 100644
--- a/Base/XBaseDtoHub.cs
+++ b/Base/XBaseDtoHub.cs
@@ -1,12 +1,12 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.SignalR;
-using Microsoft.Extensions.Logging;
-using xCommons.Extensions;
 using xModels.Base;
+using System.Threading;
+using xCommons.Extensions;
+using System.Threading.Tasks;
 using xPushService.Constants;
 using xPushService.Interfaces;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.Logging;
 
 namespace xPushService.Base
 {
diff --git a/Base/XBaseDtoProvider.cs b/Base/XBaseDtoProvider.cs
index 31a0e3d..905be88 100644
--- a/Base/XBaseDtoProvider.cs
+++ b/Base/XBaseDtoProvider.cs
@@ -1,20 +1,20 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.SignalR;
-using Microsoft.EntityFrameworkCore.Query;
-using xCommons.Extensions;
-using xDataService.Configuration;
-using xDataService.Interfaces;
-using xIdentityService.Interfaces;
 using xModels.Base;
 using xModels.Dtos;
+using System.Threading;
+using xCommons.Extensions;
+using System.Threading.Tasks;
 using xPushService.Constants;
+using System.Linq.Expressions;
+using xDataService.Interfaces;
 using xPushService.Interfaces;
+using System.Collections.Generic;
+using xDataService.Configuration;
+using xIdentityService.Interfaces;
+using Microsoft.AspNetCore.SignalR;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xPushService.Base
 {
diff --git a/Base/XBaseEntityHub.cs b/Base/XBaseEntityHub.cs
index dec1fec..a439d12 100644
--- a/Base/XBaseEntityHub.cs
+++ b/Base/XBaseEntityHub.cs
@@ -1,12 +1,12 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.SignalR;
-using Microsoft.Extensions.Logging;
-using xCommons.Extensions;
 using xModels.Base;
+using System.Threading;
+using xCommons.Extensions;
+using System.Threading.Tasks;
 using xPushService.Constants;
 using xPushService.Interfaces;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.Logging;
 
 namespace xPushService.Base
 {
diff --git a/Base/XBaseEntityProvider.cs b/Base/XBaseEntityProvider.cs
index a760938..09d5246 100644
--- a/Base/XBaseEntityProvider.cs
+++ b/Base/XBaseEntityProvider.cs
@@ -1,19 +1,19 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.SignalR;
-using Microsoft.EntityFrameworkCore.Query;
-using xCommons.Extensions;
-using xDataService.Configuration;
-using xDataService.Interfaces;
-using xIdentityService.Interfaces;
 using xModels.Base;
 using xModels.Dtos;
+using System.Threading;
+using xCommons.Extensions;
+using System.Threading.Tasks;
 using xPushService.Constants;
+using System.Linq.Expressions;
+using xDataService.Interfaces;
 using xPushService.Interfaces;
+using System.Collections.Generic;
+using xDataService.Configuration;
+using xIdentityService.Interfaces;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xPushService.Base
 {
diff --git a/Base/XBaseHub.cs b/Base/XBaseHub.cs
index 6ce026d..2167006 100644
--- a/Base/XBaseHub.cs
+++ b/Base/XBaseHub.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.SignalR;
-using Microsoft.Extensions.Logging;
 using xCommons.Extensions;
+using System.Threading.Tasks;
 using xPushService.Constants;
 using xPushService.Interfaces;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.Logging;
 
 namespace xPushService.Base
 {
diff --git a/Base/XBaseProvider.cs b/Base/XBaseProvider.cs
index ab2cbae..1ec8265 100644
--- a/Base/XBaseProvider.cs
+++ b/Base/XBaseProvider.cs
@@ -1,19 +1,19 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.SignalR;
-using Microsoft.EntityFrameworkCore.Query;
-using xCommons.Extensions;
-using xDataService.Configuration;
-using xDataService.Interfaces;
-using xIdentityService.Interfaces;
 using xModels.Base;
 using xModels.Dtos;
+using System.Threading;
+using xCommons.Extensions;
+using System.Threading.Tasks;
 using xPushService.Constants;
+using System.Linq.Expressions;
+using xDataService.Interfaces;
 using xPushService.Interfaces;
+using System.Collections.Generic;
+using xDataService.Configuration;
+using xIdentityService.Interfaces;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xPushService.Base
 {
diff --git a/Base/XBaseWebRTCHub.cs b/Base/XBaseWebRTCHub.cs
index 0ce8900..d419fc2 100644
--- a/Base/XBaseWebRTCHub.cs
+++ b/Base/XBaseWebRTCHub.cs
@@ -1,10 +1,10 @@
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using xPushService.Interfaces;
-using Microsoft.AspNetCore.SignalR;
-using xPushService.Constants;
-using xCommons.Extensions;
 using System.Threading;
+using xCommons.Extensions;
+using System.Threading.Tasks;
+using xPushService.Constants;
+using xPushService.Interfaces;
+using Microsoft.Extensions.Logging;
+using Microsoft.AspNetCore.SignalR;
 
 namespace xPushService.Base
 {
diff --git a/Controllers/XBaseProvidedController.cs b/Controllers/XBaseProvidedController.cs
index e5bc37f..72133b7 100644
--- a/Controllers/XBaseProvidedController.cs
+++ b/Controllers/XBaseProvidedController.cs
@@ -1,22 +1,22 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore.Query;
-using Microsoft.Extensions.Logging;
-using xCommons.Configurations;
-using xCommons.Extensions;
-using xCommons.Providers;
-using xExceptions.Constants;
-using xIdentityService.Controllers;
-using xIdentityService.Interfaces;
 using xModels.Base;
 using xModels.Dtos;
+using System.Threading;
 using xPushService.Base;
+using xCommons.Providers;
+using xCommons.Extensions;
+using xExceptions.Constants;
+using System.Threading.Tasks;
+using xCommons.Configurations;
 using xPushService.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+using xIdentityService.Interfaces;
+using Microsoft.Extensions.Logging;
+using xIdentityService.Controllers;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xPushService.Controllers
 {
diff --git a/Controllers/XBaseRepositoryProviderController.cs b/Controllers/XBaseRepositoryProviderController.cs
index 2dbf79e..34985bb 100644
--- a/Controllers/XBaseRepositoryProviderController.cs
+++ b/Controllers/XBaseRepositoryProviderController.cs
@@ -1,24 +1,24 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore.Query;
-using Microsoft.Extensions.Logging;
-using xCommons.Configurations;
-using xCommons.Extensions;
-using xCommons.Providers;
-using xDataService.Extensions;
-using xExceptions.Constants;
-using xIdentityService.Controllers;
-using xIdentityService.Interfaces;
 using xModels.Base;
 using xModels.Dtos;
+using System.Threading;
 using xPushService.Base;
+using xCommons.Providers;
+using xCommons.Extensions;
+using xExceptions.Constants;
+using System.Threading.Tasks;
+using System.Linq.Expressions;
+using xCommons.Configurations;
+using xDataService.Extensions;
 using xPushService.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+using xIdentityService.Interfaces;
+using Microsoft.Extensions.Logging;
+using xIdentityService.Controllers;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xPushService.Controllers
 {
diff --git a/Controllers/XBaseServiceProviderController.cs b/Controllers/XBaseServiceProviderController.cs
index 8d4fccf..671a51f 100644
--- a/Controllers/XBaseServiceProviderController.cs
+++ b/Controllers/XBaseServiceProviderController.cs
@@ -1,24 +1,24 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore.Query;
-using Microsoft.Extensions.Logging;
-using xCommons.Configurations;
-using xCommons.Extensions;
-using xCommons.Providers;
-using xDataService.Extensions;
-using xExceptions.Constants;
-using xIdentityService.Controllers;
-using xIdentityService.Interfaces;
 using xModels.Base;
 using xModels.Dtos;
+using System.Threading;
 using xPushService.Base;
+using xCommons.Providers;
+using xCommons.Extensions;
+using xExceptions.Constants;
+using System.Threading.Tasks;
+using System.Linq.Expressions;
+using xCommons.Configurations;
+using xDataService.Extensions;
 using xPushService.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+using xIdentityService.Interfaces;
+using Microsoft.Extensions.Logging;
+using xIdentityService.Controllers;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xPushService.Controllers
 {
diff --git a/DI/XDIHelperExtension.cs b/DI/XDIHelperExtension.cs
index 6dd755f..ae2f6c8 100644
--- a/DI/XDIHelperExtension.cs
+++ b/DI/XDIHelperExtension.cs
@@ -1,20 +1,20 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
+using Newtonsoft.Json;
 using System.Reflection;
-using Microsoft.AspNetCore.Builder;
+using xCommons.Extensions;
+using xPushService.Helpers;
+using xExceptions.Constants;
+using xPushService.Constants;
+using xPushService.Providers;
 using Microsoft.AspNetCore.Http;
+using System.Collections.Generic;
+using xPushService.Configurations;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.SignalR;
+using Newtonsoft.Json.Serialization;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
-using xCommons.Extensions;
-using xExceptions.Constants;
-using xPushService.Configurations;
-using xPushService.Constants;
-using xPushService.Helpers;
-using xPushService.Providers;
 
 namespace xPushService.DI
 {
diff --git a/Extensions/ClaimsPrincipalExtensions.cs b/Extensions/ClaimsPrincipalExtensions.cs
index c48a042..33436ff 100644
--- a/Extensions/ClaimsPrincipalExtensions.cs
+++ b/Extensions/ClaimsPrincipalExtensions.cs
@@ -1,12 +1,12 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNetCore.SignalR;
+using xCommons.Helpers;
 using xCommons.Constants;
 using xCommons.Extensions;
-using xCommons.Helpers;
-using xIdentityModels.Constants;
 using xPushService.Models;
+using xIdentityModels.Constants;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.SignalR;
 
 namespace xPushService.Extensions
 {
diff --git a/Helpers/XPushServiceHelper.cs b/Helpers/XPushServiceHelper.cs
index 5417da2..aa3996f 100644
--- a/Helpers/XPushServiceHelper.cs
+++ b/Helpers/XPushServiceHelper.cs
@@ -1,9 +1,9 @@
-using System.Collections.Generic;
 using System.Linq;
-using xCommons.Extensions;
-using xExceptions.Constants;
 using xPushService.Base;
+using xCommons.Extensions;
 using xPushService.Models;
+using xExceptions.Constants;
+using System.Collections.Generic;
 
 namespace xPushService.Helpers {
     public class XPushServiceHelper {
diff --git a/Interfaces/IXBaseDtoHub.cs b/Interfaces/IXBaseDtoHub.cs
index 1a34420..1b348ae 100644
--- a/Interfaces/IXBaseDtoHub.cs
+++ b/Interfaces/IXBaseDtoHub.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
+using xModels.Base;
 using System.Threading;
 using System.Threading.Tasks;
-using xModels.Base;
+using System.Collections.Generic;
 
 namespace xPushService.Interfaces
 {
diff --git a/Interfaces/IXBaseDtoProvider.cs b/Interfaces/IXBaseDtoProvider.cs
index a4e2704..6f7d302 100644
--- a/Interfaces/IXBaseDtoProvider.cs
+++ b/Interfaces/IXBaseDtoProvider.cs
@@ -1,17 +1,17 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.SignalR;
-using Microsoft.EntityFrameworkCore.Query;
-using xDataService.Configuration;
-using xDataService.Interfaces;
-using xIdentityService.Interfaces;
 using xModels.Base;
 using xModels.Dtos;
+using System.Threading;
 using xPushService.Base;
+using System.Threading.Tasks;
+using System.Linq.Expressions;
+using xDataService.Interfaces;
+using System.Collections.Generic;
+using xDataService.Configuration;
+using xIdentityService.Interfaces;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xPushService.Interfaces
 {
diff --git a/Interfaces/IXBaseEntityHub.cs b/Interfaces/IXBaseEntityHub.cs
index 5abc701..8415122 100644
--- a/Interfaces/IXBaseEntityHub.cs
+++ b/Interfaces/IXBaseEntityHub.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
+using xModels.Base;
 using System.Threading;
 using System.Threading.Tasks;
-using xModels.Base;
+using System.Collections.Generic;
 
 namespace xPushService.Interfaces
 {
diff --git a/Interfaces/IXBaseEntityProvider.cs b/Interfaces/IXBaseEntityProvider.cs
index 22f3bef..6b02a90 100644
--- a/Interfaces/IXBaseEntityProvider.cs
+++ b/Interfaces/IXBaseEntityProvider.cs
@@ -1,17 +1,17 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.SignalR;
-using Microsoft.EntityFrameworkCore.Query;
-using xDataService.Configuration;
-using xDataService.Interfaces;
-using xIdentityService.Interfaces;
 using xModels.Base;
 using xModels.Dtos;
+using System.Threading;
 using xPushService.Base;
+using System.Threading.Tasks;
+using System.Linq.Expressions;
+using xDataService.Interfaces;
+using System.Collections.Generic;
+using xDataService.Configuration;
+using xIdentityService.Interfaces;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xPushService.Interfaces
 {
diff --git a/Interfaces/IXBaseProvidedController.cs b/Interfaces/IXBaseProvidedController.cs
index 123b349..73af6dc 100644
--- a/Interfaces/IXBaseProvidedController.cs
+++ b/Interfaces/IXBaseProvidedController.cs
@@ -1,10 +1,10 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
 using xModels.Base;
 using xModels.Dtos;
+using System.Threading;
 using xPushService.Base;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
 
 namespace xPushService.Interfaces
 {
diff --git a/Interfaces/IXBaseProvider.cs b/Interfaces/IXBaseProvider.cs
index 103b046..268ee3f 100644
--- a/Interfaces/IXBaseProvider.cs
+++ b/Interfaces/IXBaseProvider.cs
@@ -1,17 +1,17 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.SignalR;
-using Microsoft.EntityFrameworkCore.Query;
-using xDataService.Configuration;
-using xDataService.Interfaces;
-using xIdentityService.Interfaces;
 using xModels.Base;
 using xModels.Dtos;
+using System.Threading;
 using xPushService.Base;
+using System.Threading.Tasks;
+using System.Linq.Expressions;
+using xDataService.Interfaces;
+using System.Collections.Generic;
+using xDataService.Configuration;
+using xIdentityService.Interfaces;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xPushService.Interfaces
 {
diff --git a/Interfaces/IXBaseRepositoryProviderController.cs b/Interfaces/IXBaseRepositoryProviderController.cs
index b34b4c5..9491af7 100644
--- a/Interfaces/IXBaseRepositoryProviderController.cs
+++ b/Interfaces/IXBaseRepositoryProviderController.cs
@@ -1,13 +1,13 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore.Query;
 using xModels.Base;
 using xModels.Dtos;
+using System.Threading;
 using xPushService.Base;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xPushService.Interfaces
 {
diff --git a/Interfaces/IXBaseServiceProviderController.cs b/Interfaces/IXBaseServiceProviderController.cs
index 47d4436..e32d0f8 100644
--- a/Interfaces/IXBaseServiceProviderController.cs
+++ b/Interfaces/IXBaseServiceProviderController.cs
@@ -1,13 +1,13 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore.Query;
 using xModels.Base;
 using xModels.Dtos;
+using System.Threading;
 using xPushService.Base;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xPushService.Interfaces
 {
diff --git a/Models/XHubUserInfo.cs b/Models/XHubUserInfo.cs
index b6212d3..c2075f2 100644
--- a/Models/XHubUserInfo.cs
+++ b/Models/XHubUserInfo.cs
@@ -1,6 +1,6 @@
+using System;
 using xModels.Base;
 using xIdentityModels.Constants;
-using System;
 using System.Collections.Generic;
 
 namespace xPushService.Models
diff --git a/Providers/XHubContextFactory.cs b/Providers/XHubContextFactory.cs
index fa34835..bfdd87d 100644
--- a/Providers/XHubContextFactory.cs
+++ b/Providers/XHubContextFactory.cs
@@ -1,7 +1,7 @@
 using System;
+using xPushService.Interfaces;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.DependencyInjection;
-using xPushService.Interfaces;
 
 namespace xPushService.Providers
 {