diff --git a/Directory.Packages.props b/Directory.Packages.props
index 9d2cc9f..68090da 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -9,7 +9,6 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageVersion>
     <PackageVersion Include="Egw.Data" Version="2.8.9.716" />
-    <PackageVersion Include="Egw.Window.Data" Version="2.8.1.2611" />
     <PackageVersion Include="EgwCoreLib.Lux.Core" Version="1.0.2609.718" />
     <PackageVersion Include="EgwCoreLib.Lux.Data" Version="1.0.2609.718" />
     <PackageVersion Include="EgwCoreLib.Razor" Version="1.5.2606.2416" />
diff --git a/Test.UI/Components/Pages/EditJWD.razor.cs b/Test.UI/Components/Pages/EditJWD.razor.cs
index f0a426e..5b492cd 100644
--- a/Test.UI/Components/Pages/EditJWD.razor.cs
+++ b/Test.UI/Components/Pages/EditJWD.razor.cs
@@ -5,6 +5,7 @@ using EgwCoreLib.Lux.Data.DbModel.Config;
 using EgwCoreLib.Lux.Data.DbModel.Utils;
 using EgwCoreLib.Lux.Data.Services;
 using EgwCoreLib.Lux.Data.Services.Config;
+using EgwCoreLib.Lux.Data.Services.General;
 using EgwCoreLib.Lux.Data.Services.Utils;
 using Microsoft.AspNetCore.Components;
 using Newtonsoft.Json;
@@ -272,13 +273,13 @@ namespace Test.UI.Components.Pages
             AvailProfileList = await CPService.GetAllAsync();
 
             // FixMe Todo: eliminare da REDIS e usare elenco DB solamente...
-            var rawProfiles = CDService.ProfileList(cEnvir, "Default");
+            var rawProfiles = await CDService.ProfileListAsync(cEnvir, "Default");
             // se fosse vuoto chiamo update...
             if (rawProfiles == null || rawProfiles.Count == 0)
             {
-                rawProfiles = CDService.ProfileList(cEnvir, "Default");
+                rawProfiles = await CDService.ProfileListAsync(cEnvir, "Default");
             }
-            var rawHw = CDService.HwModelList(cEnvir, "HW.AGB");
+            var rawHw = await CDService.HwModelListAsync(cEnvir, "HW.AGB");
             // hw filtro solo validi...
             AllConfHardware = rawHw
                         .Where(x => !x.FamilyName.Equals(x.Description, StringComparison.OrdinalIgnoreCase))
@@ -295,7 +296,7 @@ namespace Test.UI.Components.Pages
                                         .Select(x => x.FamilyName)
                                         .ToList();
             AvailHardwareList = AllConfHardware
-                                .Select(x => new Egw.Window.Data.Hardware(x.Id, x.FamilyName, x.Description, x.OpeningType, x.Shape, x.SashQty, x.SashPosition))
+                                .Select(x => new Hardware(x.Id, x.FamilyName, x.Description, x.OpeningType, x.Shape, x.SashQty, x.SashPosition))
                                 .ToList();
             AvailWoodList = AllConfWood
                                 .Select(x => x.Description)
diff --git a/Test.UI/Components/Pages/Home.razor.cs b/Test.UI/Components/Pages/Home.razor.cs
index 5178221..b8aa5ef 100644
--- a/Test.UI/Components/Pages/Home.razor.cs
+++ b/Test.UI/Components/Pages/Home.razor.cs
@@ -8,6 +8,7 @@ using WebWindowComplex;
 using Egw.Data.Window;
 using WebWindowComplex.DTO;
 using WebWindowConfigurator.DTO;
+using EgwCoreLib.Lux.Data.Services.General;
 
 namespace Test.UI.Components.Pages
 {
diff --git a/Test.UI/Components/Pages/SimpleEditOld.razor.cs b/Test.UI/Components/Pages/SimpleEditOld.razor.cs
index 1a62806..131dd7a 100644
--- a/Test.UI/Components/Pages/SimpleEditOld.razor.cs
+++ b/Test.UI/Components/Pages/SimpleEditOld.razor.cs
@@ -2,6 +2,7 @@ using Egw.Data.Window;
 using EgwCoreLib.Lux.Core;
 using EgwCoreLib.Lux.Core.RestPayload;
 using EgwCoreLib.Lux.Data.Services;
+using EgwCoreLib.Lux.Data.Services.General;
 using Microsoft.AspNetCore.Components;
 using Newtonsoft.Json;
 using WebWindowTest.DTO;
diff --git a/Test.UI/Components/Pages/TestError.razor.cs b/Test.UI/Components/Pages/TestError.razor.cs
index 932fe38..f4035f7 100644
--- a/Test.UI/Components/Pages/TestError.razor.cs
+++ b/Test.UI/Components/Pages/TestError.razor.cs
@@ -2,6 +2,7 @@ using Egw.Data.Window;
 using EgwCoreLib.Lux.Core;
 using EgwCoreLib.Lux.Core.RestPayload;
 using EgwCoreLib.Lux.Data.Services;
+using EgwCoreLib.Lux.Data.Services.General;
 using Microsoft.AspNetCore.Components;
 using Newtonsoft.Json;
 using WebWindowComplex;
diff --git a/Test.UI/Program.cs b/Test.UI/Program.cs
index aa5e725..7ef7c3f 100644
--- a/Test.UI/Program.cs
+++ b/Test.UI/Program.cs
@@ -1,5 +1,6 @@
 using EgwCoreLib.Lux.Data;
-using EgwCoreLib.Lux.Data.Services;
+using EgwCoreLib.Lux.Data.Services.General;
+using EgwCoreLib.Lux.Data.Services.Internal;
 using Microsoft.EntityFrameworkCore;
 using NLog;
 using NLog.Web;
diff --git a/Test.UI/Test.UI.csproj b/Test.UI/Test.UI.csproj
index 9b7d26e..5a28d9b 100644
--- a/Test.UI/Test.UI.csproj
+++ b/Test.UI/Test.UI.csproj
@@ -27,6 +27,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="Egw.Data" />
     <PackageReference Include="NLog" />
     <PackageReference Include="NLog.Web.AspNetCore" />
     <ProjectReference Include="..\Test.UI.Client\Test.UI.Client.csproj" />
diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj
index ad7a6e6..17d6afe 100644
--- a/WebWindowComplex/WebWindowComplex.csproj
+++ b/WebWindowComplex/WebWindowComplex.csproj
@@ -6,7 +6,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>3.1.9.718</Version>
+    <Version>3.1.9.810</Version>
     <Authors>Annamaria Sassi</Authors>
     <Company>Egalware</Company>
     <Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -132,6 +132,11 @@
 
 
 
+
+
+
+
+
 
 
 
diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj
index 765d130..ac25e62 100644
--- a/WebWindowConfigurator/WebWindowConfigurator.csproj
+++ b/WebWindowConfigurator/WebWindowConfigurator.csproj
@@ -6,7 +6,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-        <Version>3.1.9.718</Version>
+        <Version>3.1.9.810</Version>
         <Authors>Annamaria Sassi</Authors>
         <Company>Egalware</Company>
         <Description>Componente gestione JWD per LUX</Description>
@@ -234,6 +234,8 @@
 
 
 
+
+