diff --git a/Controller/XWebinarServiceControllerBase.cs b/Controllers/XWebinarServiceControllerBase.cs
similarity index 98%
rename from Controller/XWebinarServiceControllerBase.cs
rename to Controllers/XWebinarServiceControllerBase.cs
index 4ea7593..7ec168d 100644
--- a/Controller/XWebinarServiceControllerBase.cs
+++ b/Controllers/XWebinarServiceControllerBase.cs
@@ -14,7 +14,7 @@ using xModels.Dtos;
 using xWebinarService.Interfaces;
 using xWebinarService.Models.Dtos;
 
-namespace xWebinarService.Controller
+namespace xWebinarService.Controllers
 {
     /// <summary>
     /// a Controller base Class which implement based Actions to Provides Webinar Provider Access ...
@@ -197,14 +197,14 @@ namespace xWebinarService.Controller
         /// </summary>
         /// <returns></returns>
         [HttpGet("Ids")]
-        public virtual async Task<ActionResult<IEnumerable<Guid>>> GetWebinarIds()
+        public virtual ActionResult<IEnumerable<Guid>> GetWebinarIds()
         {
             //
             // Do ...
             try
             {
                 //
-                var result = await WebinarProvider
+                var result = WebinarProvider
                     .GetWebinarIds();
 
                 //
@@ -255,7 +255,7 @@ namespace xWebinarService.Controller
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet("QueryIds")]
-        public virtual async Task<ActionResult<XQueryResult<Guid>>> QueryWebinarIds(
+        public virtual ActionResult<XQueryResult<Guid>> QueryWebinarIds(
             [FromQuery] XQuery query
         )
         {
@@ -264,7 +264,7 @@ namespace xWebinarService.Controller
             try
             {
                 //
-                var result = await WebinarProvider
+                var result = WebinarProvider
                     .QueryWebinarIds(query);
 
                 //
diff --git a/Hub/XWebinarHub.cs b/Hubs/XWebinarHub.cs
similarity index 99%
rename from Hub/XWebinarHub.cs
rename to Hubs/XWebinarHub.cs
index 202ce85..9dca8ec 100644
--- a/Hub/XWebinarHub.cs
+++ b/Hubs/XWebinarHub.cs
@@ -14,7 +14,7 @@ using xWebinarService.Constants;
 using xWebinarService.Models.Dtos;
 using xWebinarService.Interfaces;
 
-namespace xWebinarService.Hub
+namespace xWebinarService.Hubs
 {
     public class XWebinarHub : XBaseWebRTCHub
     {
diff --git a/Interfaces/IXWebinarProvider.cs b/Interfaces/IXWebinarProvider.cs
index 7be2097..4046357 100644
--- a/Interfaces/IXWebinarProvider.cs
+++ b/Interfaces/IXWebinarProvider.cs
@@ -67,7 +67,7 @@ namespace xWebinarService.Interfaces
         /// Retrieve all Exists Webinar Ids ...
         /// </summary>
         /// <returns></returns>
-        Task<IEnumerable<Guid>> GetWebinarIds();
+        IEnumerable<Guid> GetWebinarIds();
 
         /// <summary>
         /// Retrieve all Exists Webinars ...
@@ -87,7 +87,7 @@ namespace xWebinarService.Interfaces
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
-        Task<XQueryResult<Guid>> QueryWebinarIds(XQuery query);
+        XQueryResult<Guid> QueryWebinarIds(XQuery query);
 
         /// <summary>
         /// Remove Specified Webinar ...
diff --git a/Interfaces/IXWebinarServiceControllerActions.cs b/Interfaces/IXWebinarServiceControllerActions.cs
index d8bcb5a..f6a76d6 100644
--- a/Interfaces/IXWebinarServiceControllerActions.cs
+++ b/Interfaces/IXWebinarServiceControllerActions.cs
@@ -45,7 +45,7 @@ namespace xWebinarService.Interfaces
         /// Retrieve all Exists Webinar Ids ...
         /// </summary>
         /// <returns></returns>
-        Task<ActionResult<IEnumerable<Guid>>> GetWebinarIds();
+        ActionResult<IEnumerable<Guid>> GetWebinarIds();
 
         /// <summary>
         /// Query Webinars ...
@@ -59,7 +59,7 @@ namespace xWebinarService.Interfaces
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
-        Task<ActionResult<XQueryResult<Guid>>> QueryWebinarIds([FromQuery] XQuery query);
+        ActionResult<XQueryResult<Guid>> QueryWebinarIds([FromQuery] XQuery query);
 
         /// <summary>
         /// Remove Specified Webinar ...
diff --git a/Providers/XWebinarProvider.cs b/Providers/XWebinarProvider.cs
index 09893d0..0200362 100644
--- a/Providers/XWebinarProvider.cs
+++ b/Providers/XWebinarProvider.cs
@@ -95,7 +95,7 @@ namespace xWebinarService.Providers
 
             //
             // Prepare Inner API Providers Device Dto ...
-            var device = await IdentityProvider.GetDevice();
+            var device = IdentityProvider.GetDevice();
             var userInfo = await IdentityProvider.GetUserInfo(
                 device: device,
                 userSelectByParam: model.OwnerId
@@ -131,7 +131,7 @@ namespace xWebinarService.Providers
 
             //
             // Retrieve User Info ...
-            var device = await IdentityProvider.GetDevice();
+            var device = IdentityProvider.GetDevice();
             var userInfo = await IdentityProvider.GetUserInfo(
                 device: device,
                 userSelectByParam: model.SubscriberId
@@ -335,7 +335,7 @@ namespace xWebinarService.Providers
                 entity.Type = item.Type;
                 entity = await WebinarRepository.UpdateAsync(entity.Id, entity);
             }
-            
+
             //
             // Check if Enabled Change Update it ...
             if (entity.Enabled != item.Enabled)
@@ -456,10 +456,10 @@ namespace xWebinarService.Providers
         /// Retrieve all Exists Webinar Ids ...
         /// </summary>
         /// <returns></returns>
-        public async Task<IEnumerable<Guid>> GetWebinarIds()
+        public IEnumerable<Guid> GetWebinarIds()
         {
             //
-            var result = await WebinarRepository.AsQueryable().SelectAsync(async l => l.Id);
+            var result = WebinarRepository.AsQueryable().Select(l => l.Id);
 
             //
             return result;
@@ -547,7 +547,7 @@ namespace xWebinarService.Providers
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
-        public async Task<XQueryResult<Guid>> QueryWebinarIds(XQuery query)
+        public XQueryResult<Guid> QueryWebinarIds(XQuery query)
         {
             //
             // Validate ...
@@ -563,7 +563,7 @@ namespace xWebinarService.Providers
             //
             // Since in Resourceable Entities we have to Search on Locales
             // we Must Implement Senario Custom ...
-            var items = await GetWebinarIds();
+            var items = GetWebinarIds();
             var totalItemsCount = items.Count();
 
             //
@@ -723,7 +723,7 @@ namespace xWebinarService.Providers
 
             //
             // Check User Exists ...
-            var device = await IdentityProvider.GetDevice();
+            var device = IdentityProvider.GetDevice();
             XOpenActionUserInfoDto userInfo = null;
             try
             {
@@ -790,7 +790,7 @@ namespace xWebinarService.Providers
 
             //
             // Check User Exists ...
-            var device = await IdentityProvider.GetDevice();
+            var device = IdentityProvider.GetDevice();
             XOpenActionUserInfoDto userInfo = null;
             try
             {
diff --git a/xWebinarService.csproj b/xWebinarService.csproj
index 62a2a5f..563e46e 100644
--- a/xWebinarService.csproj
+++ b/xWebinarService.csproj
@@ -24,15 +24,17 @@
   <ItemGroup>
     <PackageReference Include="xDashboard.xDataService" Version="1.0.0" />
     <PackageReference Include="xDashboard.xStringService" Version="1.0.0" />
-    <PackageReference Include="xDashboard.xIdentityService" Version="1.0.0" />
+    <!-- <PackageReference Include="xDashboard.xIdentityService" Version="1.0.0" /> -->
   </ItemGroup>
 
   <!-- Local Dependencies -->
   <ItemGroup>
     <ProjectReference Include="../xPushService/xPushService.csproj" />
-    <!-- <ProjectReference Include="../xDataService/xDataService.csproj" />
+    <ProjectReference Include="../xIdentityService/xIdentityService.csproj" /> 
+    <!-- 
+    <ProjectReference Include="../xDataService/xDataService.csproj" />
     <ProjectReference Include="../xStringService/xStringService.csproj" />
-    <ProjectReference Include="../xIdentityService/xIdentityService.csproj" /> -->
+    -->
   </ItemGroup>
 
 </Project>