diff --git a/Builders/XRepositoryDescriptorBuilder.cs b/Builders/XRepositoryDescriptorBuilder.cs
index fadd8f4..5cf8add 100644
--- a/Builders/XRepositoryDescriptorBuilder.cs
+++ b/Builders/XRepositoryDescriptorBuilder.cs
@@ -1,10 +1,10 @@
+using xModels.Base;
 using GraphQL.Types;
 using xDataService.Db;
-using xDataService.GraphQL;
-using xDataService.Interfaces;
 using xDataService.Models;
+using xDataService.GraphQL;
 using xDataService.Providers;
-using xModels.Base;
+using xDataService.Interfaces;
 
 namespace xDataService.Builders
 {
diff --git a/Configuration/XDataBaseConfiguration.cs b/Configuration/XDataBaseConfiguration.cs
index 866e975..7066634 100644
--- a/Configuration/XDataBaseConfiguration.cs
+++ b/Configuration/XDataBaseConfiguration.cs
@@ -1,5 +1,5 @@
-using System.Collections.Generic;
 using xDataService.Constants;
+using System.Collections.Generic;
 
 namespace xDataService.Configuration
 {
diff --git a/Configuration/XDataServiceConfiguration.cs b/Configuration/XDataServiceConfiguration.cs
index b65957b..102d16d 100644
--- a/Configuration/XDataServiceConfiguration.cs
+++ b/Configuration/XDataServiceConfiguration.cs
@@ -1,5 +1,5 @@
-using System.Collections.Generic;
 using xDataService.Constants;
+using System.Collections.Generic;
 
 namespace xDataService.Configuration
 {
diff --git a/Controllers/XBaseRepositoryController.cs b/Controllers/XBaseRepositoryController.cs
index 014e79d..caa260b 100644
--- a/Controllers/XBaseRepositoryController.cs
+++ b/Controllers/XBaseRepositoryController.cs
@@ -1,20 +1,20 @@
 using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using xCommons.Configurations;
-using xCommons.Extensions;
-using xCommons.Providers;
-using xExceptions.Constants;
+using System.Linq;
 using xModels.Base;
 using xModels.Dtos;
-using xDataService.Interfaces;
-using System.Linq;
-using Microsoft.EntityFrameworkCore.Query;
 using System.Threading;
+using xCommons.Providers;
+using xCommons.Extensions;
 using xCommons.Controllers;
+using xExceptions.Constants;
+using System.Threading.Tasks;
+using xCommons.Configurations;
+using xDataService.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+using Microsoft.Extensions.Logging;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xDataService.Controllers
 {
diff --git a/Controllers/XBaseServiceController.cs b/Controllers/XBaseServiceController.cs
index 0cb1fae..f54695a 100644
--- a/Controllers/XBaseServiceController.cs
+++ b/Controllers/XBaseServiceController.cs
@@ -1,20 +1,20 @@
 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.Controllers;
-using xCommons.Extensions;
-using xCommons.Providers;
-using xDataService.Interfaces;
-using xExceptions.Constants;
 using xModels.Base;
 using xModels.Dtos;
+using System.Threading;
+using xCommons.Providers;
+using xCommons.Extensions;
+using xCommons.Controllers;
+using xExceptions.Constants;
+using System.Threading.Tasks;
+using xCommons.Configurations;
+using xDataService.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+using Microsoft.Extensions.Logging;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xDataService.Controllers
 {
diff --git a/DI/XDIHelperExtension.cs b/DI/XDIHelperExtension.cs
index 487a9db..4195f6e 100644
--- a/DI/XDIHelperExtension.cs
+++ b/DI/XDIHelperExtension.cs
@@ -1,19 +1,19 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
+using xCommons.Helpers;
+using xCommons.Extensions;
+using xDataService.Models;
+using xDataService.Helpers;
+using xExceptions.Constants;
+using xDataService.Constants;
+using xDataService.Providers;
+using xDataService.Extensions;
+using System.Collections.Generic;
+using xDataService.Configuration;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using xCommons.Extensions;
-using xCommons.Helpers;
-using xDataService.Configuration;
-using xDataService.Constants;
-using xDataService.Extensions;
-using xDataService.Helpers;
-using xDataService.Models;
-using xDataService.Providers;
-using xExceptions.Constants;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace xDataService.DI
 {
diff --git a/Db/XDbContext.cs b/Db/XDbContext.cs
index 4f3b364..047d2e0 100644
--- a/Db/XDbContext.cs
+++ b/Db/XDbContext.cs
@@ -1,10 +1,9 @@
 using System;
 using System.Linq;
-using Microsoft.EntityFrameworkCore;
 using xCommons.Extensions;
-using xDataService.Configuration;
-using xDataService.Helpers;
 using xDataService.Providers;
+using xDataService.Configuration;
+using Microsoft.EntityFrameworkCore;
 
 namespace xDataService.Db
 {
diff --git a/Db/XUnitOfWorks.cs b/Db/XUnitOfWorks.cs
index 1975202..3b89582 100644
--- a/Db/XUnitOfWorks.cs
+++ b/Db/XUnitOfWorks.cs
@@ -1,8 +1,8 @@
+using xModels.Base;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
 using xDataService.Interfaces;
-using xModels.Base;
+using Microsoft.EntityFrameworkCore;
 
 namespace xDataService.Db {
     /// <summary>
diff --git a/Extensions/DbContextOptionExtensions.cs b/Extensions/DbContextOptionExtensions.cs
index acde7ce..7a786c6 100644
--- a/Extensions/DbContextOptionExtensions.cs
+++ b/Extensions/DbContextOptionExtensions.cs
@@ -1,6 +1,6 @@
 using System;
-using Microsoft.EntityFrameworkCore.Infrastructure;
 using MySql.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace xDataService.Extensions {
     public static class DbContextOptionExtensions {
diff --git a/Extensions/EntityExtensions.cs b/Extensions/EntityExtensions.cs
index 3e40e0c..aa02a7f 100644
--- a/Extensions/EntityExtensions.cs
+++ b/Extensions/EntityExtensions.cs
@@ -1,9 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using xCommons.Extensions;
 using xModels.Base;
+using xCommons.Extensions;
+using System.Linq.Expressions;
+using System.Collections.Generic;
 
 namespace xDataService.Extensions {
     public static class EntityExtensions {
diff --git a/Extensions/IQueryableExtensions.cs b/Extensions/IQueryableExtensions.cs
index 0191f8a..d040cd0 100644
--- a/Extensions/IQueryableExtensions.cs
+++ b/Extensions/IQueryableExtensions.cs
@@ -1,16 +1,16 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using xCommons.Extensions;
-using xDataService.Configuration;
-using xDataService.Constants;
-using xExceptions.Constants;
 using xModels.Base;
 using xModels.Dtos;
+using System.Reflection;
+using xCommons.Extensions;
+using xExceptions.Constants;
+using System.Threading.Tasks;
+using xDataService.Constants;
+using System.Linq.Expressions;
+using System.Collections.Generic;
+using xDataService.Configuration;
+using Microsoft.EntityFrameworkCore;
 
 namespace xDataService.Extensions
 {
@@ -22,6 +22,7 @@ namespace xDataService.Extensions
         /// <param name="source"></param>
         /// <param name="filter"></param>
         /// <typeparam name="T"></typeparam>
+        /// <typeparam name="TKey"></typeparam>
         /// <returns></returns>
         public static IQueryable<T> ApplyFilter<T, TKey>(
             this IQueryable<T> source,
@@ -40,6 +41,7 @@ namespace xDataService.Extensions
         /// <param name="source"></param>
         /// <param name="filter"></param>
         /// <typeparam name="T"></typeparam>
+        /// <typeparam name="TKey"></typeparam>
         /// <returns></returns>
         public static async Task<IQueryable<T>> ApplyFilterAsync<T, TKey>(
             this IQueryable<T> source,
@@ -84,6 +86,7 @@ namespace xDataService.Extensions
         /// <param name="source"></param>
         /// <param name="filter"></param>
         /// <typeparam name="T"></typeparam>
+        /// <typeparam name="TKey"></typeparam>
         /// <returns></returns>
         public static async Task<IEnumerable<T>> ApplyFilterAsync<T, TKey>(
             this IEnumerable<T> source,
@@ -319,6 +322,7 @@ namespace xDataService.Extensions
         /// <param name="isAscending"></param>
         /// <param name="columnsMap"></param>
         /// <typeparam name="T"></typeparam>
+        /// <typeparam name="TKey"></typeparam>
         /// <returns></returns>
         public static IQueryable<T> ApplySorting<T, TKey>(
             this IQueryable<T> source,
@@ -372,6 +376,7 @@ namespace xDataService.Extensions
         /// <param name="isAscending"></param>
         /// <param name="columnsMap"></param>
         /// <typeparam name="T"></typeparam>
+        /// <typeparam name="TKey"></typeparam>
         /// <returns></returns>
         public static IEnumerable<T> ApplySorting<T, TKey>(
             this IEnumerable<T> source,
diff --git a/Extensions/XDataServiceConfigurationExtensions.cs b/Extensions/XDataServiceConfigurationExtensions.cs
index ee84c13..06c092f 100644
--- a/Extensions/XDataServiceConfigurationExtensions.cs
+++ b/Extensions/XDataServiceConfigurationExtensions.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using xCommons.Extensions;
-using xDataService.Configuration;
 using xDataService.Constants;
+using xDataService.Configuration;
 
 namespace xDataService.Extensions {
     public static class XDataServiceConfigurationExtensions {
diff --git a/Extensions/XDatabaseDescriptorExtensions.cs b/Extensions/XDatabaseDescriptorExtensions.cs
index f34bab0..124f7c5 100644
--- a/Extensions/XDatabaseDescriptorExtensions.cs
+++ b/Extensions/XDatabaseDescriptorExtensions.cs
@@ -1,6 +1,6 @@
 using xCommons.Extensions;
-using xDataService.Constants;
 using xDataService.Models;
+using xDataService.Constants;
 
 namespace xDataService.Extensions
 {
diff --git a/Extensions/XGraphQLExtensions.cs b/Extensions/XGraphQLExtensions.cs
index a6bccfb..616f0ad 100644
--- a/Extensions/XGraphQLExtensions.cs
+++ b/Extensions/XGraphQLExtensions.cs
@@ -1,7 +1,7 @@
 using GraphQL;
+using xModels.Dtos;
 using GraphQL.Types;
 using xDataService.Constants;
-using xModels.Dtos;
 
 namespace xDataService.Extensions {
     public static class XGraphQLExtensions {
diff --git a/Extensions/XMongoDbExtensions.cs b/Extensions/XMongoDbExtensions.cs
index 319ab77..d664d60 100644
--- a/Extensions/XMongoDbExtensions.cs
+++ b/Extensions/XMongoDbExtensions.cs
@@ -1,16 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using MongoDB.Bson;
 using MongoDB.Driver;
-using MongoDB.Driver.Core.Bindings;
-using MongoDB.Driver.Core.Clusters;
-using MongoDB.Driver.Core.Servers;
-using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
-using MongoDB.Driver.Linq;
 using xDataService.Mongo;
+using MongoDB.Driver.Linq;
+using System.Collections.Generic;
 
 namespace xDataService.Extensions {
     public static class XMongoDbExtensions {
diff --git a/Extensions/XReferenceExtensions.cs b/Extensions/XReferenceExtensions.cs
index ce975b7..3b7985e 100644
--- a/Extensions/XReferenceExtensions.cs
+++ b/Extensions/XReferenceExtensions.cs
@@ -1,16 +1,16 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
 using xCommons.Extensions;
 using xDataService.Models;
+using System.ComponentModel;
+using System.Collections.Generic;
 
 namespace xDataService.Extensions
 {
     public static class XReferenceExtensions
     {
         /// <summary>
-        /// Converts an XReference<T> to String Representation ...
+        /// Converts an XReference to String Representation ...
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="source"></param>
@@ -42,7 +42,7 @@ namespace xDataService.Extensions
         }
 
         /// <summary>
-        /// Parse an String and Extract to XReference<T> if it's Described ...
+        /// Parse an String and Extract to XReference if it's Described ...
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="source"></param>
@@ -75,9 +75,10 @@ namespace xDataService.Extensions
                     try
                     {
                         referencedTo = (T)Convert.ChangeType(parts[1], typeof(T));
-                    } catch
+                    }
+                    catch
                     {
-                        referencedTo = (T)TypeDescriptor.GetConverter(typeof(T)).ConvertFrom(parts[1]);                        
+                        referencedTo = (T)TypeDescriptor.GetConverter(typeof(T)).ConvertFrom(parts[1]);
                     }
 
                     //
@@ -96,7 +97,7 @@ namespace xDataService.Extensions
         }
 
         /// <summary>
-        /// Converts a Collection of XReference<T> to it's String Representation ...
+        /// Converts a Collection of XReference to it's String Representation ...
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="source"></param>
@@ -150,7 +151,7 @@ namespace xDataService.Extensions
         }
 
         /// <summary>
-        /// Parse an string to XReference<T> Collection Representation ...
+        /// Parse an string to XReference Collection Representation ...
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="source"></param>
diff --git a/Extensions/XRepositoryDescriptorExtensions.cs b/Extensions/XRepositoryDescriptorExtensions.cs
index 6428043..1c5d817 100644
--- a/Extensions/XRepositoryDescriptorExtensions.cs
+++ b/Extensions/XRepositoryDescriptorExtensions.cs
@@ -1,9 +1,9 @@
-using xCommons.Extensions;
+using xModels.Base;
 using xDataService.Db;
-using xDataService.Interfaces;
+using xCommons.Extensions;
 using xDataService.Models;
 using xDataService.Providers;
-using xModels.Base;
+using xDataService.Interfaces;
 
 namespace xDataService.Extensions
 {
diff --git a/GraphQL/XBaseGraphObjectType.cs b/GraphQL/XBaseGraphObjectType.cs
index b7e1818..d0b00b7 100644
--- a/GraphQL/XBaseGraphObjectType.cs
+++ b/GraphQL/XBaseGraphObjectType.cs
@@ -1,11 +1,12 @@
-using GraphQL.Types;
 using xModels.Base;
+using GraphQL.Types;
 
 namespace xDataService.GraphQL
 {
     /// <summary>
     /// Base Entity GraphType Object ...
     /// </summary>
+    /// <typeparam name="TEntity"></typeparam>
     /// <typeparam name="TKey"></typeparam>
     public abstract class XBaseGraphObjectType<TEntity, TKey> : ObjectGraphType<TEntity>
         where TEntity : XBaseEntity<TKey> {
diff --git a/GraphQL/XBaseGraphQLEventType.cs b/GraphQL/XBaseGraphQLEventType.cs
index 9febbc4..4c3100e 100644
--- a/GraphQL/XBaseGraphQLEventType.cs
+++ b/GraphQL/XBaseGraphQLEventType.cs
@@ -1,6 +1,6 @@
+using xModels.Base;
 using GraphQL.Types;
 using xDataService.Models;
-using xModels.Base;
 
 namespace xDataService.GraphQL {
     public class XBaseGraphQLEventType<TEntity, TKey, TGraphType> : ObjectGraphType<XBaseEventModel<TEntity>>
diff --git a/GraphQL/XBaseGraphQLQuery.cs b/GraphQL/XBaseGraphQLQuery.cs
index d45ac0b..634f1e2 100644
--- a/GraphQL/XBaseGraphQLQuery.cs
+++ b/GraphQL/XBaseGraphQLQuery.cs
@@ -1,13 +1,13 @@
 using System;
-using System.Linq.Expressions;
+using xModels.Base;
 using GraphQL.Types;
 using xCommons.Extensions;
-using xDataService.Configuration;
+using xDataService.Models;
 using xDataService.Constants;
+using System.Linq.Expressions;
 using xDataService.Extensions;
 using xDataService.Interfaces;
-using xDataService.Models;
-using xModels.Base;
+using xDataService.Configuration;
 
 namespace xDataService.GraphQL
 {
diff --git a/GraphQL/XBaseGraphQLSubscription.cs b/GraphQL/XBaseGraphQLSubscription.cs
index 5e325b6..f788075 100644
--- a/GraphQL/XBaseGraphQLSubscription.cs
+++ b/GraphQL/XBaseGraphQLSubscription.cs
@@ -1,11 +1,11 @@
-using System.Collections.Generic;
-using GraphQL.Resolvers;
+using xModels.Base;
 using GraphQL.Types;
+using GraphQL.Resolvers;
 using xCommons.Extensions;
+using xDataService.Models;
 using xDataService.Providers;
 using xDataService.Interfaces;
-using xDataService.Models;
-using xModels.Base;
+using System.Collections.Generic;
 
 namespace xDataService.GraphQL {
     public abstract class XBaseGraphQLSubscription<TEntity, TKey, TGraph> : ObjectGraphType
diff --git a/GraphQL/XBaseGraphQLTypeHelper.cs b/GraphQL/XBaseGraphQLTypeHelper.cs
index bf3ce11..5c8c836 100644
--- a/GraphQL/XBaseGraphQLTypeHelper.cs
+++ b/GraphQL/XBaseGraphQLTypeHelper.cs
@@ -1,7 +1,7 @@
-using xCommons.Extensions;
-using xDataService.Configuration;
-using xDataService.Interfaces;
 using xModels.Base;
+using xCommons.Extensions;
+using xDataService.Interfaces;
+using xDataService.Configuration;
 
 namespace xDataService.GraphQL
 {
diff --git a/Helpers/XCursorHelper.cs b/Helpers/XCursorHelper.cs
index a113c64..c63d945 100644
--- a/Helpers/XCursorHelper.cs
+++ b/Helpers/XCursorHelper.cs
@@ -1,7 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using xCommons.Extensions;
+using System.Collections.Generic;
 
 namespace xDataService.Helpers {
     public partial class XCursorHelper {
diff --git a/Helpers/XDataServiceHelper.cs b/Helpers/XDataServiceHelper.cs
index 423e8b0..002675d 100644
--- a/Helpers/XDataServiceHelper.cs
+++ b/Helpers/XDataServiceHelper.cs
@@ -1,28 +1,28 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
 using GraphQL;
-using GraphQL.Server;
-using GraphQL.Server.Ui.Playground;
-using GraphQL.Server.Ui.Voyager;
+using System.Linq;
+using xModels.Base;
 using GraphQL.Types;
+using GraphQL.Server;
+using xDataService.Db;
+using System.Reflection;
+using xCommons.Extensions;
+using xDataService.Models;
+using xDataService.GraphQL;
+using xExceptions.Constants;
+using xDataService.Constants;
+using xDataService.Providers;
+using xDataService.Extensions;
+using xDataService.Interfaces;
+using GraphQL.Server.Ui.Voyager;
+using System.Collections.Generic;
+using MongoDB.Bson.Serialization;
+using GraphQL.Server.Ui.Playground;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
-using MongoDB.Bson.Serialization;
-using MongoDB.Bson.Serialization.Conventions;
 using MySql.EntityFrameworkCore.Extensions;
-using xCommons.Extensions;
-using xDataService.Constants;
-using xDataService.Db;
-using xDataService.Extensions;
-using xDataService.GraphQL;
-using xDataService.Interfaces;
-using xDataService.Models;
-using xDataService.Providers;
-using xExceptions.Constants;
-using xModels.Base;
+using MongoDB.Bson.Serialization.Conventions;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace xDataService.Helpers
 {
diff --git a/Helpers/XGraphQLHelper.cs b/Helpers/XGraphQLHelper.cs
index 51b3074..0cd0d8f 100644
--- a/Helpers/XGraphQLHelper.cs
+++ b/Helpers/XGraphQLHelper.cs
@@ -1,6 +1,6 @@
+using xModels.Dtos;
 using GraphQL.Types;
 using xDataService.Models;
-using xModels.Dtos;
 
 namespace xDataService.Constants {
     public static class XGraphQLHelper {
diff --git a/Interfaces/IXBaseDbSeeder.cs b/Interfaces/IXBaseDbSeeder.cs
index 953dcf9..3351f6a 100644
--- a/Interfaces/IXBaseDbSeeder.cs
+++ b/Interfaces/IXBaseDbSeeder.cs
@@ -1,6 +1,6 @@
+using xModels.Base;
 using System.Threading.Tasks;
 using xDataService.Configuration;
-using xModels.Base;
 
 namespace xDataService.Interfaces
 {
diff --git a/Interfaces/IXBaseGraphQLQuery.cs b/Interfaces/IXBaseGraphQLQuery.cs
index 8e0aa70..842553d 100644
--- a/Interfaces/IXBaseGraphQLQuery.cs
+++ b/Interfaces/IXBaseGraphQLQuery.cs
@@ -1,5 +1,5 @@
-using GraphQL.Types;
 using xModels.Base;
+using GraphQL.Types;
 
 namespace xDataService.Interfaces
 {
diff --git a/Interfaces/IXBaseReferencedProvider.cs b/Interfaces/IXBaseReferencedProvider.cs
index 5faaa89..56cc486 100644
--- a/Interfaces/IXBaseReferencedProvider.cs
+++ b/Interfaces/IXBaseReferencedProvider.cs
@@ -1,8 +1,8 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using xDataService.Models;
 using xModels.Dtos;
+using System.Threading;
+using xDataService.Models;
+using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace xDataService.Interfaces
 {
diff --git a/Interfaces/IXBaseRepository.cs b/Interfaces/IXBaseRepository.cs
index e9b0fc5..90cb9d3 100644
--- a/Interfaces/IXBaseRepository.cs
+++ b/Interfaces/IXBaseRepository.cs
@@ -1,13 +1,12 @@
 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.EntityFrameworkCore.Query;
 using xModels.Base;
 using xModels.Dtos;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Linq.Expressions;
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xDataService.Interfaces
 {
diff --git a/Interfaces/IXBaseRepositoryController.cs b/Interfaces/IXBaseRepositoryController.cs
index c616f35..26d1528 100644
--- a/Interfaces/IXBaseRepositoryController.cs
+++ b/Interfaces/IXBaseRepositoryController.cs
@@ -1,12 +1,12 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
+using xModels.Base;
+using xModels.Dtos;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Query;
-using xModels.Base;
-using xModels.Dtos;
 
 namespace xDataService.Interfaces
 {
@@ -14,7 +14,6 @@ namespace xDataService.Interfaces
     /// an Interface for Base Repository Actions Providing Using Controllers ...
     /// </summary>
     /// <typeparam name="TEntity"></typeparam>
-    /// <typeparam name="TDto"></typeparam>
     /// <typeparam name="TKey"></typeparam>
     public interface IXBaseRepositoryController<TEntity, TKey>
     where TEntity : XBaseEntity<TKey>
diff --git a/Interfaces/IXBaseRepositoryEvents.cs b/Interfaces/IXBaseRepositoryEvents.cs
index 699c1d5..08a7755 100644
--- a/Interfaces/IXBaseRepositoryEvents.cs
+++ b/Interfaces/IXBaseRepositoryEvents.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Collections.Generic;
 using xDataService.Models;
+using System.Collections.Generic;
 
 namespace xDataService.Interfaces {
     public interface IXBaseRepositoryEvents<T> {
diff --git a/Interfaces/IXBaseRepositoryService.cs b/Interfaces/IXBaseRepositoryService.cs
index 22f1ea3..fd9db0c 100644
--- a/Interfaces/IXBaseRepositoryService.cs
+++ b/Interfaces/IXBaseRepositoryService.cs
@@ -1,14 +1,13 @@
 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 AutoMapper;
-using Microsoft.EntityFrameworkCore.Query;
+using System.Linq;
 using xModels.Base;
 using xModels.Dtos;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Linq.Expressions;
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xDataService.Interfaces
 {
diff --git a/Interfaces/IXBaseServiceController.cs b/Interfaces/IXBaseServiceController.cs
index 9e5928a..752a45b 100644
--- a/Interfaces/IXBaseServiceController.cs
+++ b/Interfaces/IXBaseServiceController.cs
@@ -1,12 +1,12 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
+using xModels.Base;
+using xModels.Dtos;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Query;
-using xModels.Base;
-using xModels.Dtos;
 
 namespace xDataService.Interfaces
 {
diff --git a/Interfaces/IXDatabaseDescriptor.cs b/Interfaces/IXDatabaseDescriptor.cs
index 7a88253..e9e31b3 100644
--- a/Interfaces/IXDatabaseDescriptor.cs
+++ b/Interfaces/IXDatabaseDescriptor.cs
@@ -1,12 +1,12 @@
 using System;
-using System.Collections.Generic;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using MongoDB.Bson.Serialization.Conventions;
-using xDataService.Configuration;
-using xDataService.Constants;
 using xDataService.Db;
 using xDataService.Models;
+using xDataService.Constants;
+using System.Collections.Generic;
+using xDataService.Configuration;
+using Microsoft.Extensions.Configuration;
+using MongoDB.Bson.Serialization.Conventions;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace xDataService.Interfaces
 {
diff --git a/Interfaces/IXEntityRegisterar.cs b/Interfaces/IXEntityRegisterar.cs
index 9c4da06..e9cecdd 100644
--- a/Interfaces/IXEntityRegisterar.cs
+++ b/Interfaces/IXEntityRegisterar.cs
@@ -1,7 +1,7 @@
 using System;
+using xModels.Base;
 using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore;
-using xModels.Base;
 
 namespace xDataService.Interfaces
 {
diff --git a/Interfaces/IXKeyGenerator.cs b/Interfaces/IXKeyGenerator.cs
index 6720d15..ed94fec 100644
--- a/Interfaces/IXKeyGenerator.cs
+++ b/Interfaces/IXKeyGenerator.cs
@@ -1,6 +1,6 @@
+using xModels.Base;
 using System.Threading;
 using System.Threading.Tasks;
-using xModels.Base;
 
 namespace xDataService.Interfaces
 {
diff --git a/Interfaces/IXUnitOfWorks.cs b/Interfaces/IXUnitOfWorks.cs
index a26899e..0b9bc8f 100644
--- a/Interfaces/IXUnitOfWorks.cs
+++ b/Interfaces/IXUnitOfWorks.cs
@@ -1,9 +1,9 @@
 using System;
+using xModels.Base;
+using xDataService.Db;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
-using xDataService.Db;
-using xModels.Base;
 
 namespace xDataService.Interfaces {
     /// <summary>
diff --git a/Models/XDatabaseDescriptor.cs b/Models/XDatabaseDescriptor.cs
index 947bb97..6f396e2 100644
--- a/Models/XDatabaseDescriptor.cs
+++ b/Models/XDatabaseDescriptor.cs
@@ -1,15 +1,15 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using MongoDB.Bson.Serialization.Conventions;
-using xCommons.Extensions;
-using xDataService.Configuration;
-using xDataService.Constants;
 using xDataService.Db;
 using xDataService.DI;
+using xCommons.Extensions;
+using xDataService.Constants;
 using xDataService.Interfaces;
+using System.Collections.Generic;
+using xDataService.Configuration;
+using Microsoft.Extensions.Configuration;
+using MongoDB.Bson.Serialization.Conventions;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace xDataService.Models
 {
diff --git a/Models/XGraphQueryResult.cs b/Models/XGraphQueryResult.cs
index 049ac09..0c920e9 100644
--- a/Models/XGraphQueryResult.cs
+++ b/Models/XGraphQueryResult.cs
@@ -1,5 +1,5 @@
-using GraphQL.Types;
 using xModels.Dtos;
+using GraphQL.Types;
 
 namespace xDataService.Models {
     public class XGraphQueryResult<TEntity, TGraph> : ObjectGraphType<XQueryResult<TEntity>>
diff --git a/Models/XGraphQueryType.cs b/Models/XGraphQueryType.cs
index 37cebb0..a6c2ea2 100644
--- a/Models/XGraphQueryType.cs
+++ b/Models/XGraphQueryType.cs
@@ -1,5 +1,5 @@
-using GraphQL.Types;
 using xModels.Dtos;
+using GraphQL.Types;
 
 namespace xDataService.Models {
     public class XGraphQueryType : InputObjectGraphType<XQuery> {
diff --git a/Models/XRepositoryDescriptor.cs b/Models/XRepositoryDescriptor.cs
index 317c6cb..8b0e807 100644
--- a/Models/XRepositoryDescriptor.cs
+++ b/Models/XRepositoryDescriptor.cs
@@ -1,10 +1,10 @@
 using System;
+using xModels.Base;
 using GraphQL.Types;
 using xDataService.Db;
 using xDataService.GraphQL;
-using xDataService.Interfaces;
 using xDataService.Providers;
-using xModels.Base;
+using xDataService.Interfaces;
 
 namespace xDataService.Models
 {
diff --git a/Mongo/XAsyncEnumerableAdapter.cs b/Mongo/XAsyncEnumerableAdapter.cs
index 16fa7ee..75e0ad9 100644
--- a/Mongo/XAsyncEnumerableAdapter.cs
+++ b/Mongo/XAsyncEnumerableAdapter.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
+using MongoDB.Driver;
 using System.Threading;
 using System.Threading.Tasks;
-using MongoDB.Driver;
+using System.Collections.Generic;
 
 namespace xDataService.Mongo {
     public class XAsyncEnumerableAdapter<T> : IAsyncEnumerable<T> {
diff --git a/Mongo/XMongoAsyncCursor.cs b/Mongo/XMongoAsyncCursor.cs
index ec75183..e354354 100644
--- a/Mongo/XMongoAsyncCursor.cs
+++ b/Mongo/XMongoAsyncCursor.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
+using MongoDB.Driver;
 using System.Threading;
 using System.Threading.Tasks;
-using MongoDB.Driver;
+using System.Collections.Generic;
 
 namespace xDataService.Mongo {
     public class XMongoAsyncCursor<T> : IAsyncCursor<T> {
diff --git a/Mongo/XMongoQueryable.cs b/Mongo/XMongoQueryable.cs
index a99097c..c0c55f1 100644
--- a/Mongo/XMongoQueryable.cs
+++ b/Mongo/XMongoQueryable.cs
@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Threading;
-using System.Threading.Tasks;
-using MongoDB.Driver;
-using MongoDB.Driver.Linq;
 using xModels.Base;
+using MongoDB.Driver;
+using System.Threading;
+using System.Collections;
+using MongoDB.Driver.Linq;
+using System.Threading.Tasks;
+using System.Linq.Expressions;
+using System.Collections.Generic;
 
 namespace xDataService.Mongo {
     public class XMongoQueryable<TEntity, TKey> : IMongoQueryable<TEntity>
diff --git a/Providers/XBaseDbSeeder.cs b/Providers/XBaseDbSeeder.cs
index 036c81b..05c1f16 100644
--- a/Providers/XBaseDbSeeder.cs
+++ b/Providers/XBaseDbSeeder.cs
@@ -1,12 +1,11 @@
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
+using xModels.Base;
 using xCommons.Extensions;
-using xDataService.Configuration;
+using System.Threading.Tasks;
 using xDataService.Constants;
 using xDataService.Interfaces;
-using xModels.Base;
+using System.Collections.Generic;
+using xDataService.Configuration;
 
 namespace xDataService.Providers
 {
diff --git a/Providers/XBaseEFRepository.cs b/Providers/XBaseEFRepository.cs
index b1defd0..d06b7f1 100644
--- a/Providers/XBaseEFRepository.cs
+++ b/Providers/XBaseEFRepository.cs
@@ -1,21 +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.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.ChangeTracking;
-using Microsoft.EntityFrameworkCore.Query;
-using xCommons.Extensions;
-using xDataService.Configuration;
-using xDataService.Db;
-using xDataService.Extensions;
-using xDataService.Interfaces;
-using xDataService.Models;
 using xModels.Base;
 using xModels.Dtos;
+using xDataService.Db;
+using System.Threading;
+using xCommons.Extensions;
+using xDataService.Models;
+using System.Threading.Tasks;
+using System.Linq.Expressions;
+using xDataService.Extensions;
+using xDataService.Interfaces;
+using System.Collections.Generic;
+using xDataService.Configuration;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Query;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 
 namespace xDataService.Providers
 {
diff --git a/Providers/XBaseEntityRegisterar.cs b/Providers/XBaseEntityRegisterar.cs
index afb40ed..65d045b 100644
--- a/Providers/XBaseEntityRegisterar.cs
+++ b/Providers/XBaseEntityRegisterar.cs
@@ -1,8 +1,8 @@
 using System;
+using xModels.Base;
+using xDataService.Interfaces;
 using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore;
-using xDataService.Interfaces;
-using xModels.Base;
 
 namespace xDataService.Providers
 {
diff --git a/Providers/XBaseEntityTypeConfiguration.cs b/Providers/XBaseEntityTypeConfiguration.cs
index 968e8c3..ab5d7f1 100644
--- a/Providers/XBaseEntityTypeConfiguration.cs
+++ b/Providers/XBaseEntityTypeConfiguration.cs
@@ -1,6 +1,6 @@
+using xModels.Base;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using xModels.Base;
 
 namespace xDataService.Providers
 {
diff --git a/Providers/XBaseInMemoryRepository.cs b/Providers/XBaseInMemoryRepository.cs
index 8c6f6ff..6fc04ee 100644
--- a/Providers/XBaseInMemoryRepository.cs
+++ b/Providers/XBaseInMemoryRepository.cs
@@ -1,19 +1,19 @@
 using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Query;
-using xCommons.Extensions;
-using xDataService.Configuration;
-using xDataService.Extensions;
-using xDataService.Interfaces;
-using xDataService.Models;
 using xModels.Base;
 using xModels.Dtos;
+using System.Threading;
+using xCommons.Extensions;
+using xDataService.Models;
+using System.Threading.Tasks;
+using System.Linq.Expressions;
+using xDataService.Extensions;
+using xDataService.Interfaces;
+using System.Collections.Generic;
+using xDataService.Configuration;
+using System.Collections.Concurrent;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xDataService.Providers
 {
diff --git a/Providers/XBaseMongoRepository.cs b/Providers/XBaseMongoRepository.cs
index c678778..4a2d900 100644
--- a/Providers/XBaseMongoRepository.cs
+++ b/Providers/XBaseMongoRepository.cs
@@ -1,20 +1,20 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Query;
-using MongoDB.Driver;
-using MongoDB.Driver.Linq;
-using xCommons.Extensions;
-using xDataService.Configuration;
-using xDataService.Extensions;
-using xDataService.Interfaces;
-using xDataService.Models;
 using xModels.Base;
 using xModels.Dtos;
+using MongoDB.Driver;
+using System.Threading;
+using MongoDB.Driver.Linq;
+using xCommons.Extensions;
+using xDataService.Models;
+using System.Threading.Tasks;
+using System.Linq.Expressions;
+using xDataService.Extensions;
+using xDataService.Interfaces;
+using System.Collections.Generic;
+using xDataService.Configuration;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xDataService.Providers
 {
diff --git a/Providers/XBaseRepositoryEvents.cs b/Providers/XBaseRepositoryEvents.cs
index b0b0e7d..7f94c27 100644
--- a/Providers/XBaseRepositoryEvents.cs
+++ b/Providers/XBaseRepositoryEvents.cs
@@ -1,9 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using xDataService.Interfaces;
 using xDataService.Models;
+using System.Reactive.Linq;
+using xDataService.Interfaces;
+using System.Reactive.Subjects;
+using System.Collections.Generic;
 
 namespace xDataService.Providers {
     /// <summary>
diff --git a/Providers/XBaseRepositoryService.cs b/Providers/XBaseRepositoryService.cs
index 8954b49..9906f0b 100644
--- a/Providers/XBaseRepositoryService.cs
+++ b/Providers/XBaseRepositoryService.cs
@@ -1,16 +1,16 @@
 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 AutoMapper;
-using Microsoft.EntityFrameworkCore.Query;
-using xCommons.Extensions;
-using xDataService.Interfaces;
+using System.Linq;
 using xModels.Base;
 using xModels.Dtos;
+using System.Threading;
+using xCommons.Extensions;
+using System.Threading.Tasks;
+using System.Linq.Expressions;
+using xDataService.Interfaces;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace xDataService.Providers
 {
@@ -19,9 +19,6 @@ namespace xDataService.Providers
     /// and provides Data Manipulation Methods using Dtos instead of Entities ...
     /// 
     /// it can be use of following Repository Patterns Implementation:
-    /// <see cref="XBaseEFRepository"/>>
-    /// <see cref="XBaseMongoRepository"/>>
-    /// <see cref="XBaseInMemoryRepository"/>>
     /// </summary>
     /// <typeparam name="TEntity"></typeparam>
     /// <typeparam name="TDto"></typeparam>
diff --git a/Providers/XEntityRegisterarHandlerService.cs b/Providers/XEntityRegisterarHandlerService.cs
index 4e52e13..90d3476 100644
--- a/Providers/XEntityRegisterarHandlerService.cs
+++ b/Providers/XEntityRegisterarHandlerService.cs
@@ -1,11 +1,11 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using Microsoft.EntityFrameworkCore;
 using xCommons.Extensions;
 using xDataService.Interfaces;
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
 
 namespace xDataService.Providers
 {
diff --git a/Providers/XGuidKeyGenerator.cs b/Providers/XGuidKeyGenerator.cs
index 24b64f9..469b03f 100644
--- a/Providers/XGuidKeyGenerator.cs
+++ b/Providers/XGuidKeyGenerator.cs
@@ -1,9 +1,9 @@
 using System;
-using System.Threading;
-using System.Threading.Tasks;
-using xCommons.Extensions;
-using xDataService.Interfaces;
 using xModels.Base;
+using System.Threading;
+using xCommons.Extensions;
+using System.Threading.Tasks;
+using xDataService.Interfaces;
 
 namespace xDataService.Providers
 {
diff --git a/Providers/XIntKeyGenerator.cs b/Providers/XIntKeyGenerator.cs
index 5355346..7b2550e 100644
--- a/Providers/XIntKeyGenerator.cs
+++ b/Providers/XIntKeyGenerator.cs
@@ -1,10 +1,10 @@
 using System.Linq;
+using xModels.Base;
 using System.Threading;
-using System.Threading.Tasks;
 using xCommons.Extensions;
+using System.Threading.Tasks;
 using xDataService.Extensions;
 using xDataService.Interfaces;
-using xModels.Base;
 
 namespace xDataService.Providers
 {
diff --git a/Providers/XKeyGenerator.cs b/Providers/XKeyGenerator.cs
index 5b57fec..01a1f44 100644
--- a/Providers/XKeyGenerator.cs
+++ b/Providers/XKeyGenerator.cs
@@ -1,7 +1,7 @@
+using xModels.Base;
 using System.Threading;
 using System.Threading.Tasks;
 using xDataService.Interfaces;
-using xModels.Base;
 
 namespace xDataService.Providers
 {
diff --git a/Providers/XLongKeyGenerator.cs b/Providers/XLongKeyGenerator.cs
index 3efc073..f4b4d5c 100644
--- a/Providers/XLongKeyGenerator.cs
+++ b/Providers/XLongKeyGenerator.cs
@@ -1,10 +1,10 @@
 using System.Linq;
+using xModels.Base;
 using System.Threading;
-using System.Threading.Tasks;
 using xCommons.Extensions;
+using System.Threading.Tasks;
 using xDataService.Extensions;
 using xDataService.Interfaces;
-using xModels.Base;
 
 namespace xDataService.Providers
 {
diff --git a/Providers/XStringKeyGenerator.cs b/Providers/XStringKeyGenerator.cs
index 94fb246..2606ce2 100644
--- a/Providers/XStringKeyGenerator.cs
+++ b/Providers/XStringKeyGenerator.cs
@@ -1,9 +1,9 @@
 using System;
-using System.Threading;
-using System.Threading.Tasks;
-using xCommons.Extensions;
-using xDataService.Interfaces;
 using xModels.Base;
+using System.Threading;
+using xCommons.Extensions;
+using System.Threading.Tasks;
+using xDataService.Interfaces;
 
 namespace xDataService.Providers
 {