diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index ed05b939..ab7d0031 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -10,14 +10,14 @@
       "rollForward": false
     },
     "dotnet-sonarscanner": {
-      "version": "11.2.0",
+      "version": "11.2.1",
       "commands": [
         "dotnet-sonarscanner"
       ],
       "rollForward": false
     },
     "dotnet-coverage": {
-      "version": "18.5.2",
+      "version": "18.6.2",
       "commands": [
         "dotnet-coverage"
       ],
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 9bd40344..8dd78bf6 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -28,8 +28,8 @@
     <PackageVersion Include="Mapster" Version="10.0.7" />
     <PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.7" />    
-    <PackageVersion Include="Microsoft.AspNetCore.Testing" Version="10.5.0" />      
+    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.Testing" Version="10.5.0" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.7" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.7" />
     <PackageVersion Include="Microsoft.Extensions.ApiDescription.Server" Version="10.0.5" />
diff --git a/demos/shared/lib/Shared.csproj b/demos/shared/lib/Shared.csproj
index dc760d11..5e8f64bb 100644
--- a/demos/shared/lib/Shared.csproj
+++ b/demos/shared/lib/Shared.csproj
@@ -7,9 +7,15 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="CommunityToolkit.Diagnostics" />
         <PackageReference Include="Mapster" />
         <PackageReference Include="Bogus" />
+    <PackageReference Include="MongoDB.Bson" />
+    <PackageReference Include="NLog" />
+    <PackageReference Include="OpenTelemetry" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
         <PackageReference Include="Spectre.Console.Cli" />
+    <PackageReference Include="YamlDotNet" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/global.json b/global.json
index 6042f439..86777426 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "10.0.202",
+        "version": "10.0.203",
         "rollForward": "latestFeature"
     }
 }
diff --git a/libs/xSdk.Core/src/xSdk.Core.csproj b/libs/xSdk.Core/src/xSdk.Core.csproj
index a2fcb55f..1f75d3d8 100644
--- a/libs/xSdk.Core/src/xSdk.Core.csproj
+++ b/libs/xSdk.Core/src/xSdk.Core.csproj
@@ -17,7 +17,7 @@
         <PackageReference Include="FluentValidation" PrivateAssets="contentfiles;analyzers;build;compile" />
         <PackageReference Include="Mapster" PrivateAssets="contentfiles;analyzers;build;compile" />
         <PackageReference Include="Microsoft.AspNet.WebApi.Client" PrivateAssets="contentfiles;analyzers;build" />
-        <PackageReference Include="Microsoft.OpenApi" PrivateAssets="contentfiles;analyzers;build;compile" />        
+        <PackageReference Include="Microsoft.OpenApi" PrivateAssets="contentfiles;analyzers;build;compile" />
         <PackageReference Include="Newtonsoft.Json" PrivateAssets="contentfiles;analyzers;build;compile" />
         <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" PrivateAssets="contentfiles;analyzers;build;compile" />
         <PackageReference Include="RestSharp" PrivateAssets="contentfiles;analyzers;build;compile" />
diff --git a/libs/xSdk.Data.EntityFramework.MongoDB/tests/xSdk.Data.EntityFramework.MongoDB.Tests.csproj b/libs/xSdk.Data.EntityFramework.MongoDB/tests/xSdk.Data.EntityFramework.MongoDB.Tests.csproj
index bd74fda3..6e454f93 100644
--- a/libs/xSdk.Data.EntityFramework.MongoDB/tests/xSdk.Data.EntityFramework.MongoDB.Tests.csproj
+++ b/libs/xSdk.Data.EntityFramework.MongoDB/tests/xSdk.Data.EntityFramework.MongoDB.Tests.csproj
@@ -13,10 +13,12 @@
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
         <PackageReference Include="Mapster" />
+    <PackageReference Include="Testcontainers" />
+        <PackageReference Include="Testcontainers.MongoDb" />
         <PackageReference Include="Microsoft.EntityFrameworkCore" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" />
-        <PackageReference Include="MongoDB.EntityFrameworkCore" />        
-        <PackageReference Include="Testcontainers.MongoDb" />        
+        <PackageReference Include="MongoDB.EntityFrameworkCore" />
+        <PackageReference Include="Testcontainers.MongoDb" />
         <PackageReference Include="xunit.v3" />
         <PackageReference Include="xunit.runner.visualstudio">
             <PrivateAssets>all</PrivateAssets>
diff --git a/xsdk.sln b/xsdk.sln
index bc921afd..fa22c6c1 100644
--- a/xsdk.sln
+++ b/xsdk.sln
@@ -23,8 +23,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xSdk.Data", "libs\xSdk.Data
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xSdk.Data.FlatFile", "libs\xSdk.Data.FlatFile\src\xSdk.Data.FlatFile.csproj", "{2160F6BE-22AB-4072-AB46-B9C504CAA305}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xSdk.Data.NoSql", "libs\xSdk.Data.NoSql\src\xSdk.Data.NoSql.csproj", "{ADF5E23B-91EF-4DC9-814D-2AABDB1E45BF}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xSdk.Data.EntityFramework", "libs\xSdk.Data.EntityFramework\src\xSdk.Data.EntityFramework.csproj", "{EC286A05-E3F7-47D1-849B-9CF7D11B3890}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xSdk.Data.EntityFramework.MongoDB", "libs\xSdk.Data.EntityFramework.MongoDB\src\xSdk.Data.EntityFramework.MongoDB.csproj", "{8D86FB99-E0B5-430F-B57E-57C1118D0CFF}"
@@ -49,8 +47,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xSdk.Data.Tests", "libs\xSd
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xSdk.Extensions.AspNetCore.Tests", "libs\xSdk.Extensions.AspNetCore\tests\xSdk.Extensions.AspNetCore.Tests.csproj", "{6D18A43A-CDB5-47D9-8A1A-683036BAEF8B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xSdk.Data.NoSql.Tests", "libs\xSdk.Data.NoSql\tests\xSdk.Data.NoSql.Tests.csproj", "{B12125E6-3AE4-46E0-8E80-9E2A6439FB4D}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xSdk.Data.FlatFile.Tests", "libs\xSdk.Data.FlatFile\tests\xSdk.Data.FlatFile.Tests.csproj", "{EEB4F941-0640-4251-A8D7-47113148D15C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xSdk.Extensions.AspNetCore.Links", "libs\xSdk.Extensions.AspNetCore.Links\src\xSdk.Extensions.AspNetCore.Links.csproj", "{E3AD9B58-D573-4AF6-A484-D3F2E6C32AAC}"
@@ -69,14 +65,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xSdk.Extensions.CloudEvents
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xSdk.Extensions.Commands.Tests", "libs\xSdk.Extensions.Commands\tests\xSdk.Extensions.Commands.Tests.csproj", "{76951DDA-F59E-4370-A4CC-087867E37792}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "xSdk.Extensions.Telemetry", "xSdk.Extensions.Telemetry", "{8CBF0247-F0BE-32CC-B790-8FDCA65C2C51}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2C9FE545-E283-CF60-C877-0E51D373A39B}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xSdk.Extensions.Telemetry.Tests", "libs\xSdk.Extensions.Telemetry\tests\xSdk.Extensions.Telemetry.Tests.csproj", "{DD91FC88-7DB6-448F-8C99-F3975F3A1F50}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{81E3ECC1-D8D9-BDBA-1FF2-526350B8940A}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -111,18 +101,6 @@ Global
 		{2160F6BE-22AB-4072-AB46-B9C504CAA305}.Release|x64.Build.0 = Release|Any CPU
 		{2160F6BE-22AB-4072-AB46-B9C504CAA305}.Release|x86.ActiveCfg = Release|Any CPU
 		{2160F6BE-22AB-4072-AB46-B9C504CAA305}.Release|x86.Build.0 = Release|Any CPU
-		{ADF5E23B-91EF-4DC9-814D-2AABDB1E45BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADF5E23B-91EF-4DC9-814D-2AABDB1E45BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ADF5E23B-91EF-4DC9-814D-2AABDB1E45BF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ADF5E23B-91EF-4DC9-814D-2AABDB1E45BF}.Debug|x64.Build.0 = Debug|Any CPU
-		{ADF5E23B-91EF-4DC9-814D-2AABDB1E45BF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{ADF5E23B-91EF-4DC9-814D-2AABDB1E45BF}.Debug|x86.Build.0 = Debug|Any CPU
-		{ADF5E23B-91EF-4DC9-814D-2AABDB1E45BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ADF5E23B-91EF-4DC9-814D-2AABDB1E45BF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ADF5E23B-91EF-4DC9-814D-2AABDB1E45BF}.Release|x64.ActiveCfg = Release|Any CPU
-		{ADF5E23B-91EF-4DC9-814D-2AABDB1E45BF}.Release|x64.Build.0 = Release|Any CPU
-		{ADF5E23B-91EF-4DC9-814D-2AABDB1E45BF}.Release|x86.ActiveCfg = Release|Any CPU
-		{ADF5E23B-91EF-4DC9-814D-2AABDB1E45BF}.Release|x86.Build.0 = Release|Any CPU
 		{EC286A05-E3F7-47D1-849B-9CF7D11B3890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EC286A05-E3F7-47D1-849B-9CF7D11B3890}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EC286A05-E3F7-47D1-849B-9CF7D11B3890}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -267,18 +245,6 @@ Global
 		{6D18A43A-CDB5-47D9-8A1A-683036BAEF8B}.Release|x64.Build.0 = Release|Any CPU
 		{6D18A43A-CDB5-47D9-8A1A-683036BAEF8B}.Release|x86.ActiveCfg = Release|Any CPU
 		{6D18A43A-CDB5-47D9-8A1A-683036BAEF8B}.Release|x86.Build.0 = Release|Any CPU
-		{B12125E6-3AE4-46E0-8E80-9E2A6439FB4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B12125E6-3AE4-46E0-8E80-9E2A6439FB4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B12125E6-3AE4-46E0-8E80-9E2A6439FB4D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B12125E6-3AE4-46E0-8E80-9E2A6439FB4D}.Debug|x64.Build.0 = Debug|Any CPU
-		{B12125E6-3AE4-46E0-8E80-9E2A6439FB4D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B12125E6-3AE4-46E0-8E80-9E2A6439FB4D}.Debug|x86.Build.0 = Debug|Any CPU
-		{B12125E6-3AE4-46E0-8E80-9E2A6439FB4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B12125E6-3AE4-46E0-8E80-9E2A6439FB4D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B12125E6-3AE4-46E0-8E80-9E2A6439FB4D}.Release|x64.ActiveCfg = Release|Any CPU
-		{B12125E6-3AE4-46E0-8E80-9E2A6439FB4D}.Release|x64.Build.0 = Release|Any CPU
-		{B12125E6-3AE4-46E0-8E80-9E2A6439FB4D}.Release|x86.ActiveCfg = Release|Any CPU
-		{B12125E6-3AE4-46E0-8E80-9E2A6439FB4D}.Release|x86.Build.0 = Release|Any CPU
 		{EEB4F941-0640-4251-A8D7-47113148D15C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EEB4F941-0640-4251-A8D7-47113148D15C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EEB4F941-0640-4251-A8D7-47113148D15C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -409,7 +375,6 @@ Global
 		{FF388FAE-081B-4CE1-9E5A-68EE75EA1CBC} = {428CC531-D0C3-475C-ADF1-4823DD90A49F}
 		{398E2D47-441A-4117-B812-17B7A989F445} = {9C6309E2-5648-4297-AF76-2C6659EFAAF4}
 		{2160F6BE-22AB-4072-AB46-B9C504CAA305} = {6FE5E729-2235-4E27-93C4-202875459083}
-		{ADF5E23B-91EF-4DC9-814D-2AABDB1E45BF} = {6FE5E729-2235-4E27-93C4-202875459083}
 		{EC286A05-E3F7-47D1-849B-9CF7D11B3890} = {6FE5E729-2235-4E27-93C4-202875459083}
 		{8D86FB99-E0B5-430F-B57E-57C1118D0CFF} = {6FE5E729-2235-4E27-93C4-202875459083}
 		{D49489F5-B855-41FF-8FAB-685590A2B535} = {9C6309E2-5648-4297-AF76-2C6659EFAAF4}
@@ -422,7 +387,6 @@ Global
 		{0D21F833-FC68-4930-92D6-0EA56812200B} = {6FE5E729-2235-4E27-93C4-202875459083}
 		{FFBF3BB8-D410-4EEA-BB02-7ACBBA3A8357} = {9C6309E2-5648-4297-AF76-2C6659EFAAF4}
 		{6D18A43A-CDB5-47D9-8A1A-683036BAEF8B} = {FF388FAE-081B-4CE1-9E5A-68EE75EA1CBC}
-		{B12125E6-3AE4-46E0-8E80-9E2A6439FB4D} = {6FE5E729-2235-4E27-93C4-202875459083}
 		{EEB4F941-0640-4251-A8D7-47113148D15C} = {6FE5E729-2235-4E27-93C4-202875459083}
 		{E3AD9B58-D573-4AF6-A484-D3F2E6C32AAC} = {FF388FAE-081B-4CE1-9E5A-68EE75EA1CBC}
 		{A842FE8A-69D3-4632-AA03-194748E4318C} = {FF388FAE-081B-4CE1-9E5A-68EE75EA1CBC}
@@ -432,10 +396,7 @@ Global
 		{13753187-3110-9BA0-5A86-C7B09223E62D} = {9C6309E2-5648-4297-AF76-2C6659EFAAF4}
 		{2A12887B-139F-EC24-8122-EED09CD80EB3} = {FF388FAE-081B-4CE1-9E5A-68EE75EA1CBC}
 		{76951DDA-F59E-4370-A4CC-087867E37792} = {FF388FAE-081B-4CE1-9E5A-68EE75EA1CBC}
-		{8CBF0247-F0BE-32CC-B790-8FDCA65C2C51} = {428CC531-D0C3-475C-ADF1-4823DD90A49F}
-		{2C9FE545-E283-CF60-C877-0E51D373A39B} = {8CBF0247-F0BE-32CC-B790-8FDCA65C2C51}
-		{DD91FC88-7DB6-448F-8C99-F3975F3A1F50} = {2C9FE545-E283-CF60-C877-0E51D373A39B}
-		{81E3ECC1-D8D9-BDBA-1FF2-526350B8940A} = {8CBF0247-F0BE-32CC-B790-8FDCA65C2C51}
+		{DD91FC88-7DB6-448F-8C99-F3975F3A1F50} = {FF388FAE-081B-4CE1-9E5A-68EE75EA1CBC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {616C08C6-30E9-451B-898B-4DBD57867C0A}