diff --git a/Constants/XTagServiceConstants.cs b/Constants/XTagServiceConstants.cs
new file mode 100644
index 0000000..ec86487
--- /dev/null
+++ b/Constants/XTagServiceConstants.cs
@@ -0,0 +1,30 @@
+namespace xTagService.Constants
+{
+    public struct XTagServiceConstants
+    {
+        //
+        // Service Extensions Log Tag ...
+        public const string XTagServiceDILogTag = "XTagService";
+
+        //
+        // Table Mapping Identifiers ...
+        public const string XTagTable = "Tags";
+
+        //
+        // GraphQL Collection Mappings ...
+        public const string XTagSingleName = "tag";
+        public const string XTagCollectionName = "tags";
+
+        //
+        // Hubs ...
+        public const string XTagDtoHub = "tagDto";
+        public const string XTagEntityHub = "tagEntity";
+
+        //
+        // Custome Constants ...
+
+        //
+        // EF Repositories Helper Extensions ... 
+        public const string GetXTagEFRepositoryDescriptor = "GetXTagEFRepositoryDescriptor";
+    }
+}
\ No newline at end of file
diff --git a/DI/XDIHelperExtension.cs b/DI/XDIHelperExtension.cs
index 151f3f3..cd8ecd8 100644
--- a/DI/XDIHelperExtension.cs
+++ b/DI/XDIHelperExtension.cs
@@ -10,6 +10,7 @@ using xDataService.Models;
 using xExceptions.Constants;
 using xPushService.DI;
 using xPushService.Helpers;
+using xTagService.Constants;
 using xTagService.Helpers;
 using xTagService.Interfaces;
 using xTagService.Interfaces.Dtos;
@@ -80,8 +81,8 @@ namespace xTagService.DI
             var pushHelper = new XPushServiceHelper();
 
             //
-            pushHelper.AddHub<XTagDtoHub>("tagDto");
-            pushHelper.AddHub<XTagEntityHub>("tagEntity");
+            pushHelper.AddHub<XTagDtoHub>(XTagServiceConstants.XTagDtoHub);
+            pushHelper.AddHub<XTagEntityHub>(XTagServiceConstants.XTagEntityHub);
 
             //
             app.UseXPushService(pushHelper);
@@ -106,7 +107,7 @@ namespace xTagService.DI
         /// <summary>
         /// a LogTag for Service ...
         /// </summary>
-        private static string XLogTag = "XTagService";
+        private static string XLogTag = XTagServiceConstants.XTagServiceDILogTag;
 
         /// <summary>
         /// print a log in Console ...
@@ -179,9 +180,9 @@ namespace xTagService.DI
                     //
                     descriptor = typeof(XTagServiceHelper)
                         .InvokeGenericMethod<XRepositoryDescriptor>(
-                            methodName: "GetXTagEFRepositoryDescriptor",
+                            args: null,
                             runtimeType: contextType,
-                            args: null
+                            methodName: XTagServiceConstants.GetXTagEFRepositoryDescriptor
                     );
                     break;
 
diff --git a/Interfaces/IXTagSeeder.cs b/Interfaces/Entities/IXTagSeeder.cs
similarity index 76%
rename from Interfaces/IXTagSeeder.cs
rename to Interfaces/Entities/IXTagSeeder.cs
index e91944a..779ea1e 100644
--- a/Interfaces/IXTagSeeder.cs
+++ b/Interfaces/Entities/IXTagSeeder.cs
@@ -1,7 +1,7 @@
 using xDataService.Interfaces;
 using xTagService.Models.Entities;
 
-namespace xTagService.Interfaces
+namespace xTagService.Interfaces.Entities
 {
     public interface IXTagSeeder : IXBaseDbSeeder<XTag, int>
     { }
diff --git a/Providers/XTagSeederBase.cs b/Providers/Entities/XTagSeederBase.cs
similarity index 90%
rename from Providers/XTagSeederBase.cs
rename to Providers/Entities/XTagSeederBase.cs
index eddf6ff..c67d21e 100644
--- a/Providers/XTagSeederBase.cs
+++ b/Providers/Entities/XTagSeederBase.cs
@@ -1,10 +1,9 @@
 using xDataService.Configuration;
 using xDataService.Providers;
-using xTagService.Interfaces;
 using xTagService.Interfaces.Entities;
 using xTagService.Models.Entities;
 
-namespace xTagService.Providers
+namespace xTagService.Providers.Entities
 {
     public abstract class XTagSeederBase : XBaseDbSeeder<XTag, int>, IXTagSeeder
     {
diff --git a/Providers/GraphQL/XTagGraphQLTypeHelper.cs b/Providers/GraphQL/XTagGraphQLTypeHelper.cs
index 3d662bf..467d4f0 100644
--- a/Providers/GraphQL/XTagGraphQLTypeHelper.cs
+++ b/Providers/GraphQL/XTagGraphQLTypeHelper.cs
@@ -1,5 +1,6 @@
 using xDataService.Configuration;
 using xDataService.GraphQL;
+using xTagService.Constants;
 using xTagService.Interfaces.Entities;
 using xTagService.Models.Entities;
 
@@ -14,12 +15,12 @@ namespace xTagService.Providers.GraphQL
 
         public override string GetInQueryCollectionName()
         {
-            return "tags";
+            return XTagServiceConstants.XTagCollectionName;
         }
 
         public override string GetInQuerySingleName()
         {
-            return "tag";
+            return XTagServiceConstants.XTagSingleName;
         }
     }
 }
\ No newline at end of file