diff --git a/Configuration/XProxyConfiguration.cs b/Configuration/XProxyConfiguration.cs
index b202fad..7b02f15 100644
--- a/Configuration/XProxyConfiguration.cs
+++ b/Configuration/XProxyConfiguration.cs
@@ -1,5 +1,5 @@
-using System.Collections.Generic;
 using xModels.Base;
+using System.Collections.Generic;
 
 namespace xIdentityService.Configuration {
     /// <summary>
diff --git a/Controllers/XBaseIdentityApiController.cs b/Controllers/XBaseIdentityApiController.cs
index 40f9eca..e6e499b 100644
--- a/Controllers/XBaseIdentityApiController.cs
+++ b/Controllers/XBaseIdentityApiController.cs
@@ -1,9 +1,9 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
+using xCommons.Providers;
 using xCommons.Attributes;
 using xCommons.Configurations;
-using xCommons.Providers;
+using Microsoft.AspNetCore.Mvc;
 using xIdentityService.Interfaces;
+using Microsoft.Extensions.Logging;
 
 namespace xIdentityService.Controllers
 {
diff --git a/Controllers/XBaseIdentityApiV1Controller.cs b/Controllers/XBaseIdentityApiV1Controller.cs
index 006c443..a109cf4 100644
--- a/Controllers/XBaseIdentityApiV1Controller.cs
+++ b/Controllers/XBaseIdentityApiV1Controller.cs
@@ -1,9 +1,9 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
+using xCommons.Providers;
 using xCommons.Attributes;
 using xCommons.Configurations;
-using xCommons.Providers;
+using Microsoft.AspNetCore.Mvc;
 using xIdentityService.Interfaces;
+using Microsoft.Extensions.Logging;
 
 namespace xIdentityService.Controllers
 {
diff --git a/Controllers/XBaseIdentityController.cs b/Controllers/XBaseIdentityController.cs
index 7af44ba..36488d7 100644
--- a/Controllers/XBaseIdentityController.cs
+++ b/Controllers/XBaseIdentityController.cs
@@ -1,18 +1,18 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using xCommons.Configurations;
 using xCommons.Constants;
-using xCommons.Controllers;
-using xCommons.Extensions;
 using xCommons.Providers;
+using xCommons.Extensions;
+using xCommons.Controllers;
 using xExceptions.Constants;
-using xIdentityModels.Constants;
+using System.Threading.Tasks;
 using xIdentityModels.Models;
+using xCommons.Configurations;
+using Microsoft.AspNetCore.Mvc;
+using xIdentityModels.Constants;
+using System.Collections.Generic;
 using xIdentityService.Constants;
 using xIdentityService.Interfaces;
+using Microsoft.Extensions.Logging;
+using Microsoft.AspNetCore.Authentication;
 
 namespace xIdentityService.Controllers
 {
diff --git a/DI/XDIHelperExtension.cs b/DI/XDIHelperExtension.cs
index 64391f8..acea0b6 100644
--- a/DI/XDIHelperExtension.cs
+++ b/DI/XDIHelperExtension.cs
@@ -1,17 +1,17 @@
 using System;
-using IdentityModel.AspNetCore.OAuth2Introspection;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Builder;
+using xCommons.Extensions;
+using xCommons.Authorization;
 using Microsoft.AspNetCore.Http;
+using xIdentityService.Security;
+using xIdentityService.Constants;
+using xIdentityService.Providers;
+using xIdentityService.Interfaces;
+using Microsoft.AspNetCore.Builder;
+using xIdentityService.Configuration;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using xCommons.Authorization;
-using xCommons.Extensions;
-using xIdentityService.Configuration;
-using xIdentityService.Constants;
-using xIdentityService.Interfaces;
-using xIdentityService.Providers;
-using xIdentityService.Security;
+using IdentityModel.AspNetCore.OAuth2Introspection;
 
 namespace xIdentityService.DI {
     public static partial class XDIHelperExtension {
@@ -31,6 +31,7 @@ namespace xIdentityService.DI {
         /// </summary>
         /// <param name="services"></param>
         /// <param name="configuration"></param>
+        /// <param name="lifeTime"></param>
         public static void AddXIdentityService (
             this IServiceCollection services,
             IConfiguration configuration,
@@ -50,6 +51,7 @@ namespace xIdentityService.DI {
         /// </summary>
         /// <param name="services"></param>
         /// <param name="configuration"></param>
+        /// <param name="lifeTime"></param>
         public static void AddXIdentityService (
             this IServiceCollection services,
             XIdentityServiceConfiguration configuration,
@@ -62,14 +64,15 @@ namespace xIdentityService.DI {
         /// Register Custome Token Provider
         /// </summary>
         /// <param name="services"></param>
+        /// <param name="lifeTime"></param>
         /// <typeparam name="T"></typeparam>
         public static void AddXTokenProvider<T> (
             this IServiceCollection services,
-            ServiceLifetime lifetime = ServiceLifetime.Singleton)
+            ServiceLifetime lifeTime = ServiceLifetime.Singleton)
         where T : IXTokenProvider {
             //
             Console.WriteLine ("IdentityService: Add Custom Token Provider ...");
-            services.Add (new ServiceDescriptor (typeof (IXTokenProvider), typeof (T), lifetime));
+            services.Add (new ServiceDescriptor (typeof (IXTokenProvider), typeof (T), lifeTime));
         }
 
         /// <summary>
diff --git a/Extensions/HttpContextExtensions.cs b/Extensions/HttpContextExtensions.cs
index e58aa04..fa5d594 100644
--- a/Extensions/HttpContextExtensions.cs
+++ b/Extensions/HttpContextExtensions.cs
@@ -1,11 +1,11 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
 using xCommons.Constants;
 using xCommons.Extensions;
+using System.Threading.Tasks;
 using xIdentityModels.Models;
+using Microsoft.AspNetCore.Http;
 using xIdentityService.Constants;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace xIdentityService.Extensions {
     public static class HttpContextExtensions {
diff --git a/Extensions/StreamExtensions.cs b/Extensions/StreamExtensions.cs
index a4c55fd..4ffbae5 100644
--- a/Extensions/StreamExtensions.cs
+++ b/Extensions/StreamExtensions.cs
@@ -1,8 +1,8 @@
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
 using xCommons.Extensions;
+using System.Collections.Generic;
 
 namespace xIdentityService.Extensions
 {
diff --git a/Extensions/XModelExtensions.cs b/Extensions/XModelExtensions.cs
index 52a4f93..602f3f9 100644
--- a/Extensions/XModelExtensions.cs
+++ b/Extensions/XModelExtensions.cs
@@ -1,5 +1,5 @@
-using xIdentityModels.Dtos;
 using xModels.Dtos;
+using xIdentityModels.Dtos;
 
 namespace xIdentityService.Extensions
 {
diff --git a/Extensions/XTokenExtensions.cs b/Extensions/XTokenExtensions.cs
index 3199a9c..b4f8727 100644
--- a/Extensions/XTokenExtensions.cs
+++ b/Extensions/XTokenExtensions.cs
@@ -1,18 +1,18 @@
 using System;
-using System.Collections.Generic;
 using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading.Tasks;
-using IdentityModel.Client;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc.Filters;
 using xCommons.Constants;
-using xCommons.Extensions;
-using xExceptions.Constants;
 using xExceptions.Models;
+using xCommons.Extensions;
+using IdentityModel.Client;
+using xExceptions.Constants;
+using System.Threading.Tasks;
 using xIdentityModels.Models;
+using System.Net.Http.Headers;
+using Microsoft.AspNetCore.Http;
+using System.Collections.Generic;
 using xIdentityService.Interfaces;
+using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Authentication;
 
 public static partial class XTokenExtensions {
     /// <summary>
@@ -182,7 +182,12 @@ public static partial class XTokenExtensions {
     /// </summary>
     /// <param name="source"></param>
     /// <param name="model"></param>
-    public static void SetXAuthenticationTokens (this IHeaderDictionary source, XLoginResponse model, string secret = null) {
+    /// <param name="secret"></param>
+    public static void SetXAuthenticationTokens (
+        this IHeaderDictionary source, 
+        XLoginResponse model, 
+        string secret = null
+    ) {
         //
         source.Remove (XAuthorization.Header);
         source.Remove (XAuthorization.RefreshToken);
@@ -248,7 +253,12 @@ public static partial class XTokenExtensions {
     /// </summary>
     /// <param name="source"></param>
     /// <param name="model"></param>
-    public static void SetXAuthenticationTokens (this HttpResponse source, XLoginResponse model, string secret) {
+    /// <param name="secret"></param>
+    public static void SetXAuthenticationTokens (
+        this HttpResponse source, 
+        XLoginResponse model, 
+        string secret
+    ) {
         source.Headers.SetXAuthenticationTokens (model, secret);
     }
 
diff --git a/Extensions/XUserClaimsInfoDtoExtensions.cs b/Extensions/XUserClaimsInfoDtoExtensions.cs
index 535d5b0..68a202c 100644
--- a/Extensions/XUserClaimsInfoDtoExtensions.cs
+++ b/Extensions/XUserClaimsInfoDtoExtensions.cs
@@ -1,6 +1,6 @@
 using xCommons.Extensions;
-using xIdentityModels.Constants;
 using xIdentityModels.Models;
+using xIdentityModels.Constants;
 
 namespace xIdentityService.Extensions {
     public static class XUserClaimsInfoDtoExtensions {
diff --git a/Interfaces/IXBaseIdentityHttpProvider.cs b/Interfaces/IXBaseIdentityHttpProvider.cs
index 96c1a4f..20fa90b 100644
--- a/Interfaces/IXBaseIdentityHttpProvider.cs
+++ b/Interfaces/IXBaseIdentityHttpProvider.cs
@@ -1,16 +1,16 @@
 using System;
 using System.IO;
-using System.Collections.Generic;
+using RestSharp;
 using System.Net.Http;
 using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using RestSharp;
 using xCommons.Providers;
+using System.Threading.Tasks;
 using xHttpService.Constants;
-using xIdentityModels.Constants;
 using xIdentityModels.Models;
 using xIdentityService.Models;
+using xIdentityModels.Constants;
+using System.Collections.Generic;
+using Microsoft.Extensions.Logging;
 
 namespace xIdentityService.Interfaces
 {
@@ -74,7 +74,7 @@ namespace xIdentityService.Interfaces
         /// </summary>
         /// <param name="endpoint"></param>
         /// <param name="addXPoweredValue"></param>
-        /// <param name=""></param>
+        /// <param name="@params"></param>
         /// <param name="headers"></param>
         /// <param name="queryStrings"></param>
         /// <returns></returns>
@@ -129,7 +129,7 @@ namespace xIdentityService.Interfaces
         );
 
         /// <summary>
-        /// Handle Call Specified Request and Retrieve XBaseRestResponse<T> ...
+        /// Handle Call Specified Request and Retrieve XBaseRestResponse ...
         /// </summary>
         /// <param name="client"></param>
         /// <param name="request"></param>
@@ -137,7 +137,7 @@ namespace xIdentityService.Interfaces
         /// <param name="supportRefreshingTokens"></param>
         /// <param name="cancellationToken"></param>
         /// <typeparam name="T"></typeparam>
-        /// <returns>an instance of XBaseRestResponse<T></returns>
+        /// <returns>an instance of XBaseRestResponse</returns>
         Task<XBaseRestResponse<T>> RunRestRequestByResponse<T>(
             RestClient client,
             RestRequest request,
diff --git a/Interfaces/IXBaseReferenced.cs b/Interfaces/IXBaseReferenced.cs
index 62cfdf8..186eb77 100644
--- a/Interfaces/IXBaseReferenced.cs
+++ b/Interfaces/IXBaseReferenced.cs
@@ -1,11 +1,9 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using xDataService.Models;
-using xIdentityModels.Models;
 using xModels.Base;
+using System.Threading;
+using xDataService.Models;
+using System.Threading.Tasks;
+using xIdentityModels.Models;
+using System.Collections.Generic;
 
 namespace xIdentityService.Interfaces
 {
@@ -89,7 +87,6 @@ namespace xIdentityService.Interfaces
         /// <param name="providedFor"></param>
         /// <param name="id"></param>
         /// <param name="cancellationToken"></param>
-        /// <typeparam name="TReferenceKey"></typeparam>
         /// <returns></returns>
         Task<IEnumerable<XReference<string>>> GetReferences(
             string providedFor,
diff --git a/Interfaces/IXBaseReferencedController.cs b/Interfaces/IXBaseReferencedController.cs
index dc28c17..3d5e625 100644
--- a/Interfaces/IXBaseReferencedController.cs
+++ b/Interfaces/IXBaseReferencedController.cs
@@ -1,9 +1,9 @@
-using System.Collections.Generic;
+using xModels.Base;
 using System.Threading;
+using xDataService.Models;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
-using xDataService.Models;
-using xModels.Base;
+using System.Collections.Generic;
 
 namespace xIdentityService.Interfaces
 {
diff --git a/Interfaces/IXIdentityBaseReferencedProvider.cs b/Interfaces/IXIdentityBaseReferencedProvider.cs
index b3dea7e..77dd9a0 100644
--- a/Interfaces/IXIdentityBaseReferencedProvider.cs
+++ b/Interfaces/IXIdentityBaseReferencedProvider.cs
@@ -1,8 +1,8 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using xDataService.Models;
-using xIdentityModels.Models;
 using xModels.Dtos;
+using xDataService.Models;
+using System.Threading.Tasks;
+using xIdentityModels.Models;
+using System.Collections.Generic;
 
 namespace xIdentityService.Interfaces
 {
@@ -61,6 +61,7 @@ namespace xIdentityService.Interfaces
         /// <summary>
         /// Retrieve References of Specific Provided ID as Query ...
         /// </summary>
+        /// <param name="query"></param>
         /// <param name="providedForId"></param>
         /// <returns></returns>
         Task<XQueryResult<TModel>> QueryReferences(
@@ -84,7 +85,7 @@ namespace xIdentityService.Interfaces
         );
 
         /// <summary>
-        /// Add Reference a Model to Specific XRefence<TKey> ...
+        /// Add Reference a Model to Specific XRefence ...
         /// </summary>
         /// <param name="model"></param>
         /// <param name="reference"></param>
@@ -114,10 +115,10 @@ namespace xIdentityService.Interfaces
         );
 
         /// <summary>
-        /// Remove Reference a Model for Specific XRefence<TKey> ...
+        /// Remove Reference a Model for Specific XRefence ...
         /// </summary>
         /// <param name="model"></param>
-        /// <param name="providedForId"></param>
+        /// <param name="reference"></param>
         /// <param name="connectionId"></param>
         /// <param name="userInfo"></param>
         /// <returns></returns>
diff --git a/Interfaces/IXIdentityProvider.cs b/Interfaces/IXIdentityProvider.cs
index 5a6d9b3..916c2fc 100644
--- a/Interfaces/IXIdentityProvider.cs
+++ b/Interfaces/IXIdentityProvider.cs
@@ -1,14 +1,14 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using IdentityModel.Client;
-using Microsoft.AspNetCore.Http;
 using RestSharp;
-using xHttpService.Constants;
-using xIdentityModels.Constants;
-using xIdentityModels.Dtos;
-using xIdentityModels.Models;
-using xIdentityModels.Navigations;
 using xModels.Dtos;
+using IdentityModel.Client;
+using xIdentityModels.Dtos;
+using System.Threading.Tasks;
+using xHttpService.Constants;
+using xIdentityModels.Models;
+using Microsoft.AspNetCore.Http;
+using xIdentityModels.Constants;
+using System.Collections.Generic;
+using xIdentityModels.Navigations;
 
 namespace xIdentityService.Interfaces
 {
diff --git a/Interfaces/IXProxyHelper.cs b/Interfaces/IXProxyHelper.cs
index b5606bf..becff02 100644
--- a/Interfaces/IXProxyHelper.cs
+++ b/Interfaces/IXProxyHelper.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Linq.Expressions;
+using System.Collections.Generic;
 using xIdentityService.Configuration;
 
 namespace xIdentityService.Interfaces {
diff --git a/Middlewares/XIdentityTokenRefresher.cs b/Middlewares/XIdentityTokenRefresher.cs
index 5e69992..9e36ed8 100644
--- a/Middlewares/XIdentityTokenRefresher.cs
+++ b/Middlewares/XIdentityTokenRefresher.cs
@@ -1,12 +1,12 @@
 using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
 using xCommons.Constants;
 using xCommons.Extensions;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
 using xIdentityModels.Extensions;
 using xIdentityService.Interfaces;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Logging;
 
 namespace xIdentityService.Middlewares {
     public partial class XIdentityTokenRefresherMiddleware {
diff --git a/Middlewares/XProxyMiddleware.cs b/Middlewares/XProxyMiddleware.cs
index be38524..273b195 100644
--- a/Middlewares/XProxyMiddleware.cs
+++ b/Middlewares/XProxyMiddleware.cs
@@ -1,25 +1,25 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Text;
-using System.Threading.Tasks;
 using System.Web;
+using System.Linq;
+using System.Text;
+using xModels.Base;
 using IdentityModel;
-using Microsoft.AspNetCore.Builder;
+using System.Net.Http;
+using xCommons.Extensions;
+using xExceptions.Constants;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
+using System.Collections.Generic;
+using xIdentityService.Constants;
+using xIdentityService.Providers;
+using xIdentityService.Interfaces;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Logging;
+using xIdentityService.Configuration;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using xCommons.Extensions;
-using xExceptions.Constants;
-using xIdentityService.Configuration;
-using xIdentityService.Constants;
-using xIdentityService.Interfaces;
-using xIdentityService.Providers;
-using xModels.Base;
 
 namespace xIdentityService.Middlewares {
     /// <summary>
diff --git a/Partial/XIdentityProvider+Admin.cs b/Partial/XIdentityProvider+Admin.cs
index 1e63d8c..b1313e9 100644
--- a/Partial/XIdentityProvider+Admin.cs
+++ b/Partial/XIdentityProvider+Admin.cs
@@ -1,9 +1,9 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using xCommons.Extensions;
-using xHttpService.Constants;
 using xIdentityModels.Dtos;
+using System.Threading.Tasks;
+using xHttpService.Constants;
 using xIdentityModels.Models;
+using System.Collections.Generic;
 using xIdentityService.Constants;
 
 namespace xIdentityService.Providers {
diff --git a/Partial/XIdentityProvider+Authentication.cs b/Partial/XIdentityProvider+Authentication.cs
index 40d2140..9bcee0d 100644
--- a/Partial/XIdentityProvider+Authentication.cs
+++ b/Partial/XIdentityProvider+Authentication.cs
@@ -1,12 +1,12 @@
 using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using IdentityModel.Client;
 using xCommons.Extensions;
+using IdentityModel.Client;
 using xExceptions.Constants;
+using System.Threading.Tasks;
 using xHttpService.Constants;
-using xIdentityModels.Extensions;
 using xIdentityModels.Models;
+using System.Collections.Generic;
+using xIdentityModels.Extensions;
 using xIdentityService.Constants;
 
 namespace xIdentityService.Providers {
diff --git a/Partial/XIdentityProvider+Friendship.cs b/Partial/XIdentityProvider+Friendship.cs
index 1a15d6c..100d0b6 100644
--- a/Partial/XIdentityProvider+Friendship.cs
+++ b/Partial/XIdentityProvider+Friendship.cs
@@ -1,14 +1,14 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
+using xModels.Dtos;
 using xCommons.Extensions;
+using xIdentityModels.Dtos;
+using System.Threading.Tasks;
 using xHttpService.Constants;
+using xIdentityModels.Models;
 using xHttpService.Extensions;
 using xIdentityModels.Constants;
-using xIdentityModels.Dtos;
-using xIdentityModels.Models;
-using xIdentityModels.Navigations;
+using System.Collections.Generic;
 using xIdentityService.Constants;
-using xModels.Dtos;
+using xIdentityModels.Navigations;
 
 namespace xIdentityService.Providers
 {
diff --git a/Partial/XIdentityProvider+Open.cs b/Partial/XIdentityProvider+Open.cs
index 804a546..4926fa4 100644
--- a/Partial/XIdentityProvider+Open.cs
+++ b/Partial/XIdentityProvider+Open.cs
@@ -1,16 +1,16 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
 using MongoDB.Bson;
+using xModels.Dtos;
 using xCommons.Constants;
 using xCommons.Extensions;
-using xExceptions.Constants;
-using xHttpService.Constants;
 using xIdentityModels.Dtos;
+using xExceptions.Constants;
+using System.Threading.Tasks;
+using xHttpService.Constants;
+using System.Collections.Generic;
 using xIdentityService.Constants;
-using xModels.Dtos;
+using System.Runtime.InteropServices;
 
 namespace xIdentityService.Providers
 {
diff --git a/Partial/XIdentityProvider+Profile.cs b/Partial/XIdentityProvider+Profile.cs
index 5f00b88..b0ddba1 100644
--- a/Partial/XIdentityProvider+Profile.cs
+++ b/Partial/XIdentityProvider+Profile.cs
@@ -1,14 +1,14 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-using xCommons.Extensions;
-using xHttpService.Constants;
-using xHttpService.Extensions;
-using xIdentityModels.Dtos;
-using xIdentityModels.Models;
-using xIdentityModels.Navigations;
-using xIdentityService.Constants;
 using xModels.Dtos;
+using xCommons.Extensions;
+using xIdentityModels.Dtos;
+using System.Threading.Tasks;
+using xHttpService.Constants;
+using xIdentityModels.Models;
+using xHttpService.Extensions;
+using Microsoft.AspNetCore.Http;
+using System.Collections.Generic;
+using xIdentityService.Constants;
+using xIdentityModels.Navigations;
 
 namespace xIdentityService.Providers {
     public partial class XIdentityProvider {
diff --git a/Partial/XIdentityProvider+Registration.cs b/Partial/XIdentityProvider+Registration.cs
index 418cfcd..30f67e9 100644
--- a/Partial/XIdentityProvider+Registration.cs
+++ b/Partial/XIdentityProvider+Registration.cs
@@ -1,12 +1,12 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
 using xCommons.Extensions;
 using xExceptions.Constants;
+using System.Threading.Tasks;
 using xHttpService.Constants;
-using xIdentityModels.Constants;
-using xIdentityModels.Extensions;
 using xIdentityModels.Models;
+using Microsoft.AspNetCore.Http;
+using xIdentityModels.Constants;
+using System.Collections.Generic;
+using xIdentityModels.Extensions;
 using xIdentityService.Constants;
 
 namespace xIdentityService.Providers {
diff --git a/Partial/XIdentityProvider+Search.cs b/Partial/XIdentityProvider+Search.cs
index 240efc8..97724b6 100644
--- a/Partial/XIdentityProvider+Search.cs
+++ b/Partial/XIdentityProvider+Search.cs
@@ -1,13 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using xModels.Dtos;
+using xIdentityModels.Dtos;
 using System.Threading.Tasks;
 using xHttpService.Constants;
-using xHttpService.Extensions;
-using xIdentityModels.Dtos;
 using xIdentityModels.Models;
+using xHttpService.Extensions;
 using xIdentityService.Constants;
-using xModels.Dtos;
 
 namespace xIdentityService.Providers
 {
diff --git a/Providers/XBaseIdentityHttpProvider.cs b/Providers/XBaseIdentityHttpProvider.cs
index 282a46a..cdfc5b2 100644
--- a/Providers/XBaseIdentityHttpProvider.cs
+++ b/Providers/XBaseIdentityHttpProvider.cs
@@ -1,27 +1,24 @@
 using System;
 using System.IO;
-using System.Collections.Generic;
+using RestSharp;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using RestSharp;
-using RestSharp.Authenticators;
 using xCommons.Constants;
-using xCommons.Extensions;
 using xCommons.Providers;
+using xCommons.Extensions;
 using xExceptions.Constants;
+using System.Threading.Tasks;
 using xHttpService.Constants;
-using xIdentityModels.Constants;
-using xIdentityModels.Extensions;
 using xIdentityModels.Models;
+using xIdentityService.Models;
+using RestSharp.Authenticators;
+using xIdentityModels.Constants;
+using System.Collections.Generic;
+using xIdentityModels.Extensions;
 using xIdentityService.Constants;
 using xIdentityService.Interfaces;
-using xIdentityService.Models;
-using xIdentityService.Extensions;
-using System.Diagnostics.Tracing;
-using MySqlX.XDevAPI.Common;
+using Microsoft.Extensions.Logging;
 
 namespace xIdentityService.Providers
 {
@@ -246,7 +243,7 @@ namespace xIdentityService.Providers
         /// </summary>
         /// <param name="endpoint"></param>
         /// <param name="addXPoweredValue"></param>
-        /// <param name=""></param>
+        /// <param name="@params"></param>
         /// <param name="headers"></param>
         /// <param name="queryStrings"></param>
         /// <returns></returns>
diff --git a/Providers/XIdentityProvider.cs b/Providers/XIdentityProvider.cs
index 83bfb35..e9a278a 100644
--- a/Providers/XIdentityProvider.cs
+++ b/Providers/XIdentityProvider.cs
@@ -1,27 +1,27 @@
 using System;
-using System.Collections.Generic;
+using RestSharp;
 using System.Linq;
 using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
-using RestSharp;
-using RestSharp.Authenticators;
+using System.Threading;
 using xCommons.Constants;
-using xCommons.Extensions;
 using xCommons.Providers;
+using xCommons.Extensions;
 using xExceptions.Constants;
+using System.Threading.Tasks;
 using xHttpService.Constants;
-using xIdentityModels.Constants;
-using xIdentityModels.Extensions;
 using xIdentityModels.Models;
-using xIdentityService.Configuration;
+using xIdentityService.Models;
+using RestSharp.Authenticators;
+using xIdentityModels.Constants;
+using System.Collections.Generic;
+using xIdentityModels.Extensions;
 using xIdentityService.Constants;
 using xIdentityService.Interfaces;
-using xIdentityService.Models;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json.Serialization;
+using xIdentityService.Configuration;
 
 namespace xIdentityService.Providers {
     public partial class XIdentityProvider : IXIdentityProvider {
@@ -230,6 +230,7 @@ namespace xIdentityService.Providers {
         /// <param name="client"></param>
         /// <param name="request"></param>
         /// <param name="method"></param>
+        /// <param name="supportRefreshingTokens"></param>
         /// <typeparam name="T"></typeparam>
         /// <returns></returns>
         public async Task<T> RunRestRequest<T> (
diff --git a/Providers/XInMemoryTokenProvider.cs b/Providers/XInMemoryTokenProvider.cs
index acfd816..55922de 100644
--- a/Providers/XInMemoryTokenProvider.cs
+++ b/Providers/XInMemoryTokenProvider.cs
@@ -1,8 +1,8 @@
-using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using xCommons.Extensions;
+using System.Threading.Tasks;
 using xIdentityModels.Models;
+using System.Collections.Generic;
 using xIdentityService.Interfaces;
 
 namespace xIdentityService.Providers {
diff --git a/Providers/XProxyHelper.cs b/Providers/XProxyHelper.cs
index 6ac60b2..3924971 100644
--- a/Providers/XProxyHelper.cs
+++ b/Providers/XProxyHelper.cs
@@ -1,12 +1,12 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
 using System.Web;
+using System.Linq;
 using xCommons.Extensions;
 using xExceptions.Constants;
-using xIdentityService.Configuration;
+using System.Linq.Expressions;
+using System.Collections.Generic;
 using xIdentityService.Interfaces;
+using xIdentityService.Configuration;
 
 namespace xIdentityService.Providers {
     public class XProxyHelper : IXProxyHelper {
diff --git a/Security/XSecurityProvider.cs b/Security/XSecurityProvider.cs
index 6afc1ba..8673388 100644
--- a/Security/XSecurityProvider.cs
+++ b/Security/XSecurityProvider.cs
@@ -1,12 +1,11 @@
 using System;
 using System.IO;
-using System.Security.Cryptography;
 using System.Text;
-using xCommons.Extensions;
-using xCommons.Helpers;
 using xCommons.Providers;
-using xIdentityService.Configuration;
+using xCommons.Extensions;
 using xIdentityService.Interfaces;
+using System.Security.Cryptography;
+using xIdentityService.Configuration;
 
 namespace xIdentityService.Security {
     public partial class XSecurityProvider : IXSecurityProvider {