diff --git a/Modules/Intent.Modules.Application.AutoMapper/release-notes.md b/Modules/Intent.Modules.Application.AutoMapper/release-notes.md
index f653c1f021..ec75b46990 100644
--- a/Modules/Intent.Modules.Application.AutoMapper/release-notes.md
+++ b/Modules/Intent.Modules.Application.AutoMapper/release-notes.md
@@ -1,8 +1,4 @@
-### Version 5.1.0
-
-- Improvement: Refactoring the pagination patterns to better suit both Repository and EF DbContext approaches.
-
-### Version 5.0.0
+### Version 5.0.0
 
 - Improvement: Updated the `AutoMapper.Extensions.Microsoft.DependencyInjection` NuGet package version to 12.0.1.
 
diff --git a/Modules/Intent.Modules.Application.Contracts.Clients/release-notes.md b/Modules/Intent.Modules.Application.Contracts.Clients/release-notes.md
index a21afa7a89..6106feec61 100644
--- a/Modules/Intent.Modules.Application.Contracts.Clients/release-notes.md
+++ b/Modules/Intent.Modules.Application.Contracts.Clients/release-notes.md
@@ -1,8 +1,4 @@
-### Version 5.0.5
-
-- Improvement: Updating various modules to use the more sophisticated CSharp mapping resolution systems.
-
-### Version 5.0.4
+### Version 5.0.4
 
 - Improvement: Updated version for `Intent.Metadata.WebApi` dependency.
 
diff --git a/Modules/Intent.Modules.Application.DependencyInjection.MediatR/release-notes.md b/Modules/Intent.Modules.Application.DependencyInjection.MediatR/release-notes.md
index 5ef30b9c52..51df180786 100644
--- a/Modules/Intent.Modules.Application.DependencyInjection.MediatR/release-notes.md
+++ b/Modules/Intent.Modules.Application.DependencyInjection.MediatR/release-notes.md
@@ -1,10 +1,6 @@
-### Version 3.5.11
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 3.5.0
 
-- Improvement: Updated MediatR version.
+- Deprecated: This functionality is now covered the `Intent.Application.MediatR` module itself.
 
 ### Version 3.4.2
 
diff --git a/Modules/Intent.Modules.Application.DependencyInjection/release-notes.md b/Modules/Intent.Modules.Application.DependencyInjection/release-notes.md
index 7f440d8af3..c5d9403298 100644
--- a/Modules/Intent.Modules.Application.DependencyInjection/release-notes.md
+++ b/Modules/Intent.Modules.Application.DependencyInjection/release-notes.md
@@ -1,7 +1,3 @@
-### Version 4.1.0
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-- 
 ### Version 4.0.7
 
 - Improvement: Updated to be compatible with .NET 8.
diff --git a/Modules/Intent.Modules.Application.Dtos/release-notes.md b/Modules/Intent.Modules.Application.Dtos/release-notes.md
index 99f269cb2c..149fc4b511 100644
--- a/Modules/Intent.Modules.Application.Dtos/release-notes.md
+++ b/Modules/Intent.Modules.Application.Dtos/release-notes.md
@@ -1,7 +1,3 @@
-### Version 4.2.0
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 4.1.1
 
 - Fixed: Protected Constructor added when parameter constructor is introduced for mapping libraries to instantiate using reflection.
diff --git a/Modules/Intent.Modules.Application.FluentValidation/release-notes.md b/Modules/Intent.Modules.Application.FluentValidation/release-notes.md
index c4e94ea90d..89208d9960 100644
--- a/Modules/Intent.Modules.Application.FluentValidation/release-notes.md
+++ b/Modules/Intent.Modules.Application.FluentValidation/release-notes.md
@@ -1,7 +1,3 @@
-### Version 3.8.9
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 3.8.7
 
 - Improvement: Added CascadeMode option on Fluent Validations to specify this behaviour.
diff --git a/Modules/Intent.Modules.Application.Identity/release-notes.md b/Modules/Intent.Modules.Application.Identity/release-notes.md
index 7128f0e381..a9692401be 100644
--- a/Modules/Intent.Modules.Application.Identity/release-notes.md
+++ b/Modules/Intent.Modules.Application.Identity/release-notes.md
@@ -1,4 +1,3 @@
-
 ### Version 3.5.1
 
 - Improvement: The generated `AuthorizeAttribute` will no longer cause nullable warnings.
diff --git a/Modules/Intent.Modules.Application.MediatR.Behaviours/Intent.Application.MediatR.Behaviours.imodspec b/Modules/Intent.Modules.Application.MediatR.Behaviours/Intent.Application.MediatR.Behaviours.imodspec
index 2348ff3e9c..2163ae5109 100644
--- a/Modules/Intent.Modules.Application.MediatR.Behaviours/Intent.Application.MediatR.Behaviours.imodspec
+++ b/Modules/Intent.Modules.Application.MediatR.Behaviours/Intent.Application.MediatR.Behaviours.imodspec
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package>
   <id>Intent.Application.MediatR.Behaviours</id>
-  <version>4.2.10-pre.3</version>
+  <version>4.2.10-pre.2</version>
   <supportedClientVersions>[4.1.0-a, 5.0.0-a)</supportedClientVersions>
   <summary>Additional MediatR middleware pipeline behaviours</summary>
   <description>Additional MediatR middleware pipeline behaviours</description>
diff --git a/Modules/Intent.Modules.Application.MediatR.Behaviours/release-notes.md b/Modules/Intent.Modules.Application.MediatR.Behaviours/release-notes.md
index 2d6e4dc7cb..b0c7d502b7 100644
--- a/Modules/Intent.Modules.Application.MediatR.Behaviours/release-notes.md
+++ b/Modules/Intent.Modules.Application.MediatR.Behaviours/release-notes.md
@@ -1,7 +1,6 @@
 ### Version 4.2.10
 
 - Improvement: Added `ArgumentNullException` check on `IUnitOfWork` dependency injection.
-- Improvement: Allow support for Redis OM Unit of Work.
 
 ### Version 4.2.7
 
diff --git a/Modules/Intent.Modules.Application.MediatR.FluentValidation/release-notes.md b/Modules/Intent.Modules.Application.MediatR.FluentValidation/release-notes.md
index 3b58c6e167..bf13026a38 100644
--- a/Modules/Intent.Modules.Application.MediatR.FluentValidation/release-notes.md
+++ b/Modules/Intent.Modules.Application.MediatR.FluentValidation/release-notes.md
@@ -1,7 +1,3 @@
-### Version 4.5.1
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 4.5.0
 
 - Improvement: Removed `// IntentMatch(...)` code management instructions from templates which are no longer needed since version `4.4.0` of the `Intent.OutputManager.RoslynWeaver` module.
diff --git a/Modules/Intent.Modules.Application.MediatR/release-notes.md b/Modules/Intent.Modules.Application.MediatR/release-notes.md
index b9d28956d6..2e8433a308 100644
--- a/Modules/Intent.Modules.Application.MediatR/release-notes.md
+++ b/Modules/Intent.Modules.Application.MediatR/release-notes.md
@@ -1,8 +1,4 @@
-### Version 4.2.2
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
-### Version 4.2.0
+### Version 4.2.0
 
 - Improvement: Added Support for `+` in roles, to describe `and` relationships between roles e.g. `Admin,Manager` (or) vs `Admin+Manager` (and)
 
diff --git a/Modules/Intent.Modules.Application.ServiceImplementations.CRUD.Eventing/release-notes.md b/Modules/Intent.Modules.Application.ServiceImplementations.CRUD.Eventing/release-notes.md
index c6c3d679a5..94499ac5e0 100644
--- a/Modules/Intent.Modules.Application.ServiceImplementations.CRUD.Eventing/release-notes.md
+++ b/Modules/Intent.Modules.Application.ServiceImplementations.CRUD.Eventing/release-notes.md
@@ -1,7 +1,3 @@
-### Version 1.0.10
-
-- Improvement: Few small fixes on using directives.
-
 ### Version 1.0.6
 
 - Updated to ensure variable name of entity to publish event for matches that in generated method implmentation by the CRUD module.
diff --git a/Modules/Intent.Modules.Application.ServiceImplementations/release-notes.md b/Modules/Intent.Modules.Application.ServiceImplementations/release-notes.md
index 476cd84bfc..1039127a47 100644
--- a/Modules/Intent.Modules.Application.ServiceImplementations/release-notes.md
+++ b/Modules/Intent.Modules.Application.ServiceImplementations/release-notes.md
@@ -1,7 +1,3 @@
-### Version 4.5.1
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 4.4.0
 
 - Update: Constructors will now be "Merge" by default. This will make user based injections and code-gen injections feasible.
diff --git a/Modules/Intent.Modules.Ardalis.Repositories/release-notes.md b/Modules/Intent.Modules.Ardalis.Repositories/release-notes.md
index a2fb6b2d31..bf0df4f5bf 100644
--- a/Modules/Intent.Modules.Ardalis.Repositories/release-notes.md
+++ b/Modules/Intent.Modules.Ardalis.Repositories/release-notes.md
@@ -1,7 +1,3 @@
-### Version 4.0.4
-
-- Improvement: Fixed the optional filters for queries that access the data with the DbContext; Refactored the way the query filters are constructed.
-
 ### Version 4.0.3
 
 - Improvement: Resolve compiler warnings.
diff --git a/Modules/Intent.Modules.AspNetCore.Controllers.Dispatch.MediatR/release-notes.md b/Modules/Intent.Modules.AspNetCore.Controllers.Dispatch.MediatR/release-notes.md
index 4e7fae68a8..45bff99832 100644
--- a/Modules/Intent.Modules.AspNetCore.Controllers.Dispatch.MediatR/release-notes.md
+++ b/Modules/Intent.Modules.AspNetCore.Controllers.Dispatch.MediatR/release-notes.md
@@ -1,7 +1,3 @@
-### Version 5.5.0
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 5.4.2
 
 - Improvement: Added Support for `+` in roles, to describe `and` relationships between roles e.g. `Admin,Manager` (or) vs `Admin+Manager` (and)
diff --git a/Modules/Intent.Modules.AspNetCore.Controllers.Dispatch.ServiceContract/Intent.AspNetCore.Controllers.Dispatch.ServiceContract.imodspec b/Modules/Intent.Modules.AspNetCore.Controllers.Dispatch.ServiceContract/Intent.AspNetCore.Controllers.Dispatch.ServiceContract.imodspec
index bc082d3c67..221ac247cf 100644
--- a/Modules/Intent.Modules.AspNetCore.Controllers.Dispatch.ServiceContract/Intent.AspNetCore.Controllers.Dispatch.ServiceContract.imodspec
+++ b/Modules/Intent.Modules.AspNetCore.Controllers.Dispatch.ServiceContract/Intent.AspNetCore.Controllers.Dispatch.ServiceContract.imodspec
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package>
   <id>Intent.AspNetCore.Controllers.Dispatch.ServiceContract</id>
-  <version>5.2.4-pre.2</version>
+  <version>5.2.4-pre.1</version>
   <supportedClientVersions>[4.1.0-a, 5.0.0-a)</supportedClientVersions>
   <summary>Instructs ASP.NET Core Controllers to dispatch requests to a separate handler via Application Contract interfaces.</summary>
   <description>Instructs ASP.NET Core Controllers to dispatch requests to a separate handler via Application Contract interfaces.</description>
diff --git a/Modules/Intent.Modules.AspNetCore.Controllers/release-notes.md b/Modules/Intent.Modules.AspNetCore.Controllers/release-notes.md
index 27a67e748a..28aed79251 100644
--- a/Modules/Intent.Modules.AspNetCore.Controllers/release-notes.md
+++ b/Modules/Intent.Modules.AspNetCore.Controllers/release-notes.md
@@ -1,7 +1,3 @@
-### Version 6.0.2
-
-- Improvement: Dependent modules changed, version bumped.
-
 ### Version 6.0.0
 
 - Improvement: Updated to support use of top-level statements and minimal hosting model improvements introduced in [`Intent.AspNetCore` version 6.0.0](https://github.com/IntentArchitect/Intent.Modules.NET/blob/development/Modules/Intent.Modules.AspNetCore/release-notes.md#version-600).
diff --git a/Modules/Intent.Modules.AspNetCore.Cors.Obsolete/Intent.Modules.AspNetCore.Cors.Obsolete.imodspec b/Modules/Intent.Modules.AspNetCore.Cors.Obsolete/Intent.Modules.AspNetCore.Cors.Obsolete.imodspec
index 1c0d247bd9..972bfe4d8e 100644
--- a/Modules/Intent.Modules.AspNetCore.Cors.Obsolete/Intent.Modules.AspNetCore.Cors.Obsolete.imodspec
+++ b/Modules/Intent.Modules.AspNetCore.Cors.Obsolete/Intent.Modules.AspNetCore.Cors.Obsolete.imodspec
@@ -11,7 +11,6 @@
   <decorators></decorators>
   <factoryExtensions></factoryExtensions>
   <moduleSettings></moduleSettings>
-  <releaseNotes>release-notes.md</releaseNotes>
   <dependencies>
     <dependency id="Intent.AspNetCore.Cors" version="3.3.11" />
   </dependencies>
diff --git a/Modules/Intent.Modules.AspNetCore.Cors.Obsolete/release-notes.md b/Modules/Intent.Modules.AspNetCore.Cors.Obsolete/release-notes.md
deleted file mode 100644
index 040ed67956..0000000000
--- a/Modules/Intent.Modules.AspNetCore.Cors.Obsolete/release-notes.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### Version 3.3.11
-
-- Obsolete: Please install `Intent.AspNetCore.Cors` as this module is no longer in use. It can be safely removed. 
-
- 
diff --git a/Modules/Intent.Modules.AspNetCore.HealthChecks/release-notes.md b/Modules/Intent.Modules.AspNetCore.HealthChecks/release-notes.md
index 72d527d064..01bb413801 100644
--- a/Modules/Intent.Modules.AspNetCore.HealthChecks/release-notes.md
+++ b/Modules/Intent.Modules.AspNetCore.HealthChecks/release-notes.md
@@ -1,7 +1,6 @@
 ### Version 2.0.2
 
 - Improvement: Added support for Oracle databases.
-- Improvement: Added support for Redis Stack.
 
 ### Version 2.0.0
 
diff --git a/Modules/Intent.Modules.AspNetCore.Identity.UI/release-notes.md b/Modules/Intent.Modules.AspNetCore.Identity.UI/release-notes.md
index 88f9cef64f..8fbd227916 100644
--- a/Modules/Intent.Modules.AspNetCore.Identity.UI/release-notes.md
+++ b/Modules/Intent.Modules.AspNetCore.Identity.UI/release-notes.md
@@ -1,7 +1,3 @@
-### Version 2.0.0
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 1.0.2
 
 - Updated dependencies and supported client versions to prevent warnings when used with Intent Architect 4.x.
diff --git a/Modules/Intent.Modules.AspNetCore.Identity/release-notes.md b/Modules/Intent.Modules.AspNetCore.Identity/release-notes.md
index 209ba483a5..ee511c403d 100644
--- a/Modules/Intent.Modules.AspNetCore.Identity/release-notes.md
+++ b/Modules/Intent.Modules.AspNetCore.Identity/release-notes.md
@@ -1,7 +1,3 @@
-### Version 4.1.0
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 4.0.8
 
 - Improvement: Updated to be compatible with .NET 8.
diff --git a/Modules/Intent.Modules.AspNetCore.IntegrationTesting/Intent.AspNetCore.IntegrationTesting.imodspec b/Modules/Intent.Modules.AspNetCore.IntegrationTesting/Intent.AspNetCore.IntegrationTesting.imodspec
index 4f2f7d1553..6ef6c043ba 100644
--- a/Modules/Intent.Modules.AspNetCore.IntegrationTesting/Intent.AspNetCore.IntegrationTesting.imodspec
+++ b/Modules/Intent.Modules.AspNetCore.IntegrationTesting/Intent.AspNetCore.IntegrationTesting.imodspec
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package>
   <id>Intent.AspNetCore.IntegrationTesting</id>
-  <version>1.0.0-pre.2</version>
+  <version>1.0.0-pre.3</version>
   <supportedClientVersions>[4.1.0-beta.21,5.0.0)</supportedClientVersions>
   <summary>The module adds support for Integration Testing Asp.Net Core applications.</summary>
   <description>The module adds support for Integration Testing Asp.Net Core applications.</description>
diff --git a/Modules/Intent.Modules.AspNetCore.IntegrationTesting/release-notes.md b/Modules/Intent.Modules.AspNetCore.IntegrationTesting/release-notes.md
index aaa3ff08fe..e222cefe4a 100644
--- a/Modules/Intent.Modules.AspNetCore.IntegrationTesting/release-notes.md
+++ b/Modules/Intent.Modules.AspNetCore.IntegrationTesting/release-notes.md
@@ -1,3 +1,3 @@
 ### Version 1.0.0
 
-- New Feature: Asp.Net Core Integration Testing module.
\ No newline at end of file
+- New Feature: Integration  Testing module.
\ No newline at end of file
diff --git a/Modules/Intent.Modules.AspNetCore.IntegrationTests.CRUD/FactoryExtensions/EndpointTestImplementationFactoryExtension.cs b/Modules/Intent.Modules.AspNetCore.IntegrationTests.CRUD/FactoryExtensions/EndpointTestImplementationFactoryExtension.cs
index a511d6dc7d..b0987064d6 100644
--- a/Modules/Intent.Modules.AspNetCore.IntegrationTests.CRUD/FactoryExtensions/EndpointTestImplementationFactoryExtension.cs
+++ b/Modules/Intent.Modules.AspNetCore.IntegrationTests.CRUD/FactoryExtensions/EndpointTestImplementationFactoryExtension.cs
@@ -104,9 +104,7 @@ private void DoCreateTest(ICSharpFileBuilderTemplate template, CrudMap crudTest)
 
                     method
                         .Async()
-                        .AddAttribute("Fact");
-                    FixCosmosTests(crudTest, method);
-                    method
+                        .AddAttribute("Fact")
                         .AddStatement("//Arrange")
                         .AddStatement($"var client = new {template.GetTypeName("Intent.AspNetCore.IntegrationTesting.HttpClient", crudTest.Proxy.Id)}(CreateClient());")
                         .AddStatement($"var dataFactory = new TestDataFactory(WebAppFactory);", s => s.SeparatedFromPrevious());
@@ -162,9 +160,7 @@ private void DoGetByIdTest(ICSharpFileBuilderTemplate template, CrudMap crudTest
 
                     method
                         .Async()
-                        .AddAttribute("Fact");
-                    FixCosmosTests(crudTest, method);
-                    method
+                        .AddAttribute("Fact")
                         .AddStatement("//Arrange")
                         .AddStatement($"var client = new {template.GetTypeName("Intent.AspNetCore.IntegrationTesting.HttpClient", crudTest.Proxy.Id)}(CreateClient());")
 
@@ -196,9 +192,7 @@ private void DoGetAllTest(ICSharpFileBuilderTemplate template, CrudMap crudTest)
 
                     method
                         .Async()
-                        .AddAttribute("Fact");
-                    FixCosmosTests(crudTest, method);
-                    method
+                        .AddAttribute("Fact")
                         .AddStatement("//Arrange")
                         .AddStatement($"var client = new {template.GetTypeName("Intent.AspNetCore.IntegrationTesting.HttpClient", crudTest.Proxy.Id)}(CreateClient());")
 
@@ -236,9 +230,7 @@ private void DoDeleteTest(ICSharpFileBuilderTemplate template, CrudMap crudTest)
 
                     method
                         .Async()
-                        .AddAttribute("Fact");
-                    FixCosmosTests(crudTest, method);
-                    method
+                        .AddAttribute("Fact")
                         .AddStatement("//Arrange")
                         .AddStatement($"var client = new {template.GetTypeName("Intent.AspNetCore.IntegrationTesting.HttpClient", crudTest.Proxy.Id)}(CreateClient());")
                         .AddStatement($"var dataFactory = new TestDataFactory(WebAppFactory);", s => s.SeparatedFromPrevious())
@@ -273,21 +265,15 @@ private void DoUpdateTest(ICSharpFileBuilderTemplate template, CrudMap crudTest)
 
                     method
                         .Async()
-                        .AddAttribute("Fact");
-                    FixCosmosTests(crudTest, method);
-                    method
+                        .AddAttribute("Fact")
                         .AddStatement("//Arrange")
                         .AddStatement($"var client = new {template.GetTypeName("Intent.AspNetCore.IntegrationTesting.HttpClient", crudTest.Proxy.Id)}(CreateClient());")
 
                         .AddStatement($"var dataFactory = new TestDataFactory(WebAppFactory);", s => s.SeparatedFromPrevious())
                         .AddStatement($"var {$"{createVarName}"} = await dataFactory.Create{crudTest.Entity.Name}();")
-                        .AddStatement($"var command = dataFactory.CreateCommand<{template.GetTypeName(updateDtoModel.TypeReference)}>();", s => s.SeparatedFromPrevious());
-
-
-                    method
-                        .AddStatement($"command.{GetDtoPkFieldName(operation)} = {sutId};");
+                        .AddStatement($"var command = dataFactory.CreateCommand<{template.GetTypeName(updateDtoModel.TypeReference)}>();", s => s.SeparatedFromPrevious())
+                        .AddStatement($"command.Id = {sutId};")
 
-                    method
                         .AddStatement("//Act", s => s.SeparatedFromPrevious())
                         .AddStatement($"await client.{crudTest.Update!.Name}Async({sutId}, command);")
 
@@ -317,46 +303,6 @@ private void DoUpdateTest(ICSharpFileBuilderTemplate template, CrudMap crudTest)
             });
         }
 
-        private void FixCosmosTests(CrudMap test, CSharpClassMethod method)
-        {
-            if (IsCosmosTest(test.Entity.InternalElement))
-            {
-                method.AddAttribute("Trait", att =>
-                {
-                    att
-                        .AddArgument("\"Category\"")
-                        .AddArgument("\"ExcludeOnCI\"")
-                        ;
-                });
-                method.WithComments(new[]
-                    {
-                        "/// <summary>",
-                        "/// The Cosmos DB Linux Emulator Docker image does not run on Microsoft's CI environment (GitHub, Azure DevOps).\")] // https://github.com/Azure/azure-cosmos-db-emulator-docker/issues/45.",
-                        "/// Filter this test out of your CI/CD if appropriate e.g. dotnet test --filter Category!=ExcludeOnCI",
-                        "/// </summary>",
-                    });
-            }
-        }
-
-        private const string CosmosDbProviderId = "3e1a00f7-c6f1-4785-a544-bbcb17602b31";
-
-        private static bool IsCosmosTest(IElement sut)
-        {
-
-            if (!sut.Package.HasStereotype("Document Database"))
-                return false;
-
-            var setting = sut.Package.GetStereotypeProperty<IElement>("Document Database", "Provider");
-            return setting == null ||setting.Id == CosmosDbProviderId;
-        }
-
-        private string GetDtoPkFieldName(IHttpEndpointModel operation)
-        {
-
-            var result = TestDataFactoryHelper.GetDtoPkFieldName(operation);
-            return result?.ToPascalCase() ?? "Id";
-        }
-
         private void PopulateTestDataFactory(ICSharpFileBuilderTemplate template, List<CrudMap> crudTests)
         {
             TestDataFactoryHelper.PopulateTestDataFactory(template, crudTests);
diff --git a/Modules/Intent.Modules.AspNetCore.IntegrationTests.CRUD/FactoryExtensions/TestImplementations/TestDataFactoryHelper.cs b/Modules/Intent.Modules.AspNetCore.IntegrationTests.CRUD/FactoryExtensions/TestImplementations/TestDataFactoryHelper.cs
index c029d8dc25..f8aae1175b 100644
--- a/Modules/Intent.Modules.AspNetCore.IntegrationTests.CRUD/FactoryExtensions/TestImplementations/TestDataFactoryHelper.cs
+++ b/Modules/Intent.Modules.AspNetCore.IntegrationTests.CRUD/FactoryExtensions/TestImplementations/TestDataFactoryHelper.cs
@@ -110,30 +110,6 @@ public static void PopulateTestDataFactory(ICSharpFileBuilderTemplate template,
 
         }
 
-        internal static string? GetDtoPkFieldName(IHttpEndpointModel operation)
-        {
-            var mapping = GetMapEntityQueryMapping(operation.InternalElement);
-            if (mapping != null) // We only doing Test for services on new mapping system
-            {
-                foreach (var mappedEnd in mapping.MappedEnds.Where(me => me.MappingType == "Filter Mapping"))
-                {
-                    var attributeModel = (mappedEnd.TargetElement as IElement)?.AsAttributeModel();
-                    if (attributeModel is not null && attributeModel.HasStereotype("Primary Key"))
-                    {
-                        return mappedEnd.SourceElement.Name;
-                    }
-
-                }
-            }
-            return null;
-        }
-        private static IElementToElementMapping? GetMapEntityQueryMapping(IElement mappedElement)
-        {
-            return mappedElement.AssociatedElements.FirstOrDefault(a => a.Association.SpecializationTypeId == "9ea0382a-4617-412a-a8c8-af987bbce226")//Update Entity Action
-                   ?.Mappings.FirstOrDefault(mappingModel => mappingModel.TypeId == "25f25af9-c38b-4053-9474-b0fabe9d7ea7");// Query Entity Mapping
-        }
-
-
         private static Dictionary<string, HashSet<string>> GetKeyAliases(List<CrudMap> crudTests)
         {
             var keyAliases = new Dictionary<string, HashSet<string>>();
@@ -162,20 +138,6 @@ private static Dictionary<string, HashSet<string>> GetKeyAliases(List<CrudMap> c
                         }
                     }
                 }
-                var dtoFieldPkName = GetDtoPkFieldName(crudTest.Update);
-                if (dtoFieldPkName != null)
-                {
-                    string entityId = $"{crudTest.Entity.Name}Id";
-                    if (dtoFieldPkName != entityId && string.Compare(dtoFieldPkName, "Id", true) != 0)
-                    {
-                        if (!keyAliases.TryGetValue(entityId, out var aliases))
-                        {
-                            aliases = new HashSet<string>();
-                            keyAliases[entityId] = aliases;
-                        }
-                        aliases.Add(dtoFieldPkName);
-                    }
-                }
             }
 
             return keyAliases;
diff --git a/Modules/Intent.Modules.AspNetCore.IntegrationTests.CRUD/Intent.AspNetCore.IntegrationTests.CRUD.imodspec b/Modules/Intent.Modules.AspNetCore.IntegrationTests.CRUD/Intent.AspNetCore.IntegrationTests.CRUD.imodspec
index 55c0b5f7fb..5e34f65044 100644
--- a/Modules/Intent.Modules.AspNetCore.IntegrationTests.CRUD/Intent.AspNetCore.IntegrationTests.CRUD.imodspec
+++ b/Modules/Intent.Modules.AspNetCore.IntegrationTests.CRUD/Intent.AspNetCore.IntegrationTests.CRUD.imodspec
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package>
   <id>Intent.AspNetCore.IntegrationTests.CRUD</id>
-  <version>1.0.0-pre.4</version>
+  <version>1.0.0-pre.1</version>
   <supportedClientVersions>[4.1.0-beta.21,5.0.0)</supportedClientVersions>
   <summary>The module adds implements integration tests for CRUD Services.</summary>
   <description>The module adds implements integration tests for CRUD Services.</description>
@@ -34,7 +34,7 @@
   </factoryExtensions>
   <moduleSettings></moduleSettings>
   <dependencies>
-    <dependency id="Intent.AspNetCore.IntegrationTesting" version="1.0.0-pre.2" />
+    <dependency id="Intent.AspNetCore.IntegrationTesting" version="1.0.0-pre.1" />
     <dependency id="Intent.Common" version="3.5.0" />
     <dependency id="Intent.Common.CSharp" version="3.4.1" />
     <dependency id="Intent.Common.Types" version="3.3.9" />
diff --git a/Modules/Intent.Modules.AspNetCore.IntegrationTests.CRUD/README.md b/Modules/Intent.Modules.AspNetCore.IntegrationTests.CRUD/README.md
index 332bfefbc0..e292849115 100644
--- a/Modules/Intent.Modules.AspNetCore.IntegrationTests.CRUD/README.md
+++ b/Modules/Intent.Modules.AspNetCore.IntegrationTests.CRUD/README.md
@@ -11,16 +11,6 @@ For a service to be eligible is must implement at least
 - Create{Entity} - returning either the `Primary Key` or a `DTO` with a mapped `Primary Key`.
 - Get{Entity}ById - returning an `Entity` based `DTO` taking a single parameter of the `Entitiy`s primary key.
 
-## Note on Cosmos DB Integration Test
-
-The CosmosDB Emulator for Linux does not run consistently using MS-hosted agents/runners (Azure DevOps or GitHub). Here (Azure/azure-cosmos-db-emulator-docker#45.) 
-Cosmos related tests have the following Trait applied `[Trait("Category", "ExcludeOnCI")]`, you can ignore these in your CI/CD pipeline as follows:-
-
-```
-dotnet test --filter Category!=ExcludeOnCI
-```
-
-
 ## Sample Tests
 
 ```csharp
diff --git a/Modules/Intent.Modules.AspNetCore.IntegrationTests.CRUD/release-notes.md b/Modules/Intent.Modules.AspNetCore.IntegrationTests.CRUD/release-notes.md
deleted file mode 100644
index ff78d90e31..0000000000
--- a/Modules/Intent.Modules.AspNetCore.IntegrationTests.CRUD/release-notes.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### Version 1.0.0
-
-- New Feature: Asp.Net Core Integration Testing CRUD module.
\ No newline at end of file
diff --git a/Modules/Intent.Modules.AspNetCore.Interop.Angular/release-notes.md b/Modules/Intent.Modules.AspNetCore.Interop.Angular/release-notes.md
index b113ce647f..f6d15957fc 100644
--- a/Modules/Intent.Modules.AspNetCore.Interop.Angular/release-notes.md
+++ b/Modules/Intent.Modules.AspNetCore.Interop.Angular/release-notes.md
@@ -1,7 +1,3 @@
-### Version 4.0.1
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 4.0.0
 
 - Improvement: Updated to support use of top-level statements and minimal hosting model improvements introduced in [`Intent.AspNetCore` version 6.0.0](https://github.com/IntentArchitect/Intent.Modules.NET/blob/development/Modules/Intent.Modules.AspNetCore/release-notes.md#version-600).
diff --git a/Modules/Intent.Modules.AspNetCore.Logging.Serilog/release-notes.md b/Modules/Intent.Modules.AspNetCore.Logging.Serilog/release-notes.md
index 4666a16b07..8832f2df36 100644
--- a/Modules/Intent.Modules.AspNetCore.Logging.Serilog/release-notes.md
+++ b/Modules/Intent.Modules.AspNetCore.Logging.Serilog/release-notes.md
@@ -1,7 +1,3 @@
-### Version 5.0.1
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 5.0.0
 
 - Improvement: Updated to support use of top-level statements and minimal hosting model improvements introduced in [`Intent.AspNetCore` version 6.0.0](https://github.com/IntentArchitect/Intent.Modules.NET/blob/development/Modules/Intent.Modules.AspNetCore/release-notes.md#version-600).
diff --git a/Modules/Intent.Modules.AspNetCore.ODataQuery/release-notes.md b/Modules/Intent.Modules.AspNetCore.ODataQuery/release-notes.md
index 8515268c45..3e5f66b27b 100644
--- a/Modules/Intent.Modules.AspNetCore.ODataQuery/release-notes.md
+++ b/Modules/Intent.Modules.AspNetCore.ODataQuery/release-notes.md
@@ -1,7 +1,3 @@
-### Version 1.0.2
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
-### Version 1.0.0
+### Version 1.0.0
 
 - New Feature: OData query module.
\ No newline at end of file
diff --git a/Modules/Intent.Modules.AspNetCore.SignalR/release-notes.md b/Modules/Intent.Modules.AspNetCore.SignalR/release-notes.md
index 2fd972e848..233bf12ed1 100644
--- a/Modules/Intent.Modules.AspNetCore.SignalR/release-notes.md
+++ b/Modules/Intent.Modules.AspNetCore.SignalR/release-notes.md
@@ -1,7 +1,3 @@
-### Version 1.0.1
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 1.0.0
 
 - Improvement: Updated to support use of top-level statements and minimal hosting model improvements introduced in [`Intent.AspNetCore` version 6.0.0](https://github.com/IntentArchitect/Intent.Modules.NET/blob/development/Modules/Intent.Modules.AspNetCore/release-notes.md#version-600).
diff --git a/Modules/Intent.Modules.AspNetCore.Swashbuckle.Security/release-notes.md b/Modules/Intent.Modules.AspNetCore.Swashbuckle.Security/release-notes.md
index fd7f73b089..9c7b76a9f1 100644
--- a/Modules/Intent.Modules.AspNetCore.Swashbuckle.Security/release-notes.md
+++ b/Modules/Intent.Modules.AspNetCore.Swashbuckle.Security/release-notes.md
@@ -1,7 +1,3 @@
-### Version 4.0.6
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
- 
 ### Version 4.0.5
 
 - Improvement: Updated dependencies.
diff --git a/Modules/Intent.Modules.AspNetCore.Swashbuckle/release-notes.md b/Modules/Intent.Modules.AspNetCore.Swashbuckle/release-notes.md
index 5fbf65cd23..5be027dfe3 100644
--- a/Modules/Intent.Modules.AspNetCore.Swashbuckle/release-notes.md
+++ b/Modules/Intent.Modules.AspNetCore.Swashbuckle/release-notes.md
@@ -1,7 +1,3 @@
-### Version 5.0.1
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 5.0.0
 
 - Improvement: Updated to support use of top-level statements and minimal hosting model improvements introduced in [`Intent.AspNetCore` version 6.0.0](https://github.com/IntentArchitect/Intent.Modules.NET/blob/development/Modules/Intent.Modules.AspNetCore/release-notes.md#version-600).
diff --git a/Modules/Intent.Modules.AspNetCore/release-notes.md b/Modules/Intent.Modules.AspNetCore/release-notes.md
index e374040ec7..b4399b725b 100644
--- a/Modules/Intent.Modules.AspNetCore/release-notes.md
+++ b/Modules/Intent.Modules.AspNetCore/release-notes.md
@@ -1,8 +1,4 @@
-### Version 6.0.1
-
-- Improvement: Dependent modules changed, version bumped.
-
-### Version 6.0.0
+### Version 6.0.0
 
 > ⚠️ **NOTE**
 >
diff --git a/Modules/Intent.Modules.Azure.BlobStorage/release-notes.md b/Modules/Intent.Modules.Azure.BlobStorage/release-notes.md
index 4d1076dee7..9c4237dc76 100644
--- a/Modules/Intent.Modules.Azure.BlobStorage/release-notes.md
+++ b/Modules/Intent.Modules.Azure.BlobStorage/release-notes.md
@@ -1,7 +1,3 @@
-### Version 3.4.0
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 3.3.2
 
 - Updated dependencies and supported client versions to prevent warnings when used with Intent Architect 4.x.
diff --git a/Modules/Intent.Modules.Azure.KeyVault/release-notes.md b/Modules/Intent.Modules.Azure.KeyVault/release-notes.md
index cfd5afb3bd..0225c51af1 100644
--- a/Modules/Intent.Modules.Azure.KeyVault/release-notes.md
+++ b/Modules/Intent.Modules.Azure.KeyVault/release-notes.md
@@ -1,7 +1,3 @@
-### 2.0.1
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### 2.0.0
 
 - Improvement: Updated to support use of top-level statements and minimal hosting model improvements introduced in [`Intent.AspNetCore` version 6.0.0](https://github.com/IntentArchitect/Intent.Modules.NET/blob/development/Modules/Intent.Modules.AspNetCore/release-notes.md#version-600).
diff --git a/Modules/Intent.Modules.Azure.TableStorage/Intent.Azure.TableStorage.imodspec b/Modules/Intent.Modules.Azure.TableStorage/Intent.Azure.TableStorage.imodspec
index 642ea55681..012353dbc0 100644
--- a/Modules/Intent.Modules.Azure.TableStorage/Intent.Azure.TableStorage.imodspec
+++ b/Modules/Intent.Modules.Azure.TableStorage/Intent.Azure.TableStorage.imodspec
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package>
   <id>Intent.Azure.TableStorage</id>
-  <version>1.0.0-beta.13</version>
+  <version>1.0.0-beta.12</version>
   <supportedClientVersions>[3.4.0, 5.0.0-a)</supportedClientVersions>
   <summary>Azure Table Storage Database Provider implementation.</summary>
   <description>Azure Table Storage Database Provider implementation.</description>
diff --git a/Modules/Intent.Modules.Blazor.HttpClients.Dtos.FluentValidation/release-notes.md b/Modules/Intent.Modules.Blazor.HttpClients.Dtos.FluentValidation/release-notes.md
index 6bb4ce14ef..f04280108e 100644
--- a/Modules/Intent.Modules.Blazor.HttpClients.Dtos.FluentValidation/release-notes.md
+++ b/Modules/Intent.Modules.Blazor.HttpClients.Dtos.FluentValidation/release-notes.md
@@ -1,7 +1,3 @@
-### Version 1.0.4
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 1.0.3
 
 - Improvement: Removed `// IntentMatch(...)` code management instructions from templates which are no longer needed since version `4.4.0` of the `Intent.OutputManager.RoslynWeaver` module.
diff --git a/Modules/Intent.Modules.Blazor.HttpClients/Intent.Blazor.HttpClients.imodspec b/Modules/Intent.Modules.Blazor.HttpClients/Intent.Blazor.HttpClients.imodspec
index 87562b2cfc..13a1925050 100644
--- a/Modules/Intent.Modules.Blazor.HttpClients/Intent.Blazor.HttpClients.imodspec
+++ b/Modules/Intent.Modules.Blazor.HttpClients/Intent.Blazor.HttpClients.imodspec
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package>
   <id>Intent.Blazor.HttpClients</id>
-  <version>3.1.0-pre.1</version>
+  <version>3.1.0-pre.2</version>
   <supportedClientVersions>[3.4.0,5.0.0)</supportedClientVersions>
   <summary>Introduces an HTTP Client implementation for Blazor applications that can make service calls against a referenced service Restful API.</summary>
   <description>Introduces an HTTP Client implementation for Blazor applications that can make service calls against a referenced service Restful API.</description>
diff --git a/Modules/Intent.Modules.Blazor.HttpClients/release-notes.md b/Modules/Intent.Modules.Blazor.HttpClients/release-notes.md
index 607fafe872..82e02976f9 100644
--- a/Modules/Intent.Modules.Blazor.HttpClients/release-notes.md
+++ b/Modules/Intent.Modules.Blazor.HttpClients/release-notes.md
@@ -1,6 +1,7 @@
 ### Version 3.1.0
 
 - Improvement: Underlying proxy templates updated to support alternate Metadata models.
+- Improvement: Upgraded Microsoft.Extensions.Http NuGet package to version 8.0.0
 
 ### Version 3.0.3
 
diff --git a/Modules/Intent.Modules.Blazor.WebAssembly/release-notes.md b/Modules/Intent.Modules.Blazor.WebAssembly/release-notes.md
index d2488c15fa..94fc0c69fc 100644
--- a/Modules/Intent.Modules.Blazor.WebAssembly/release-notes.md
+++ b/Modules/Intent.Modules.Blazor.WebAssembly/release-notes.md
@@ -1,7 +1,3 @@
-### Version 1.0.1
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
-### Version 1.0.0
+### Version 1.0.0
 
 - New Feature: Blazor WebAssembly module.
\ No newline at end of file
diff --git a/Modules/Intent.Modules.CosmosDB/FactoryExtensions/MultiTenancyFactoryExtension.cs b/Modules/Intent.Modules.CosmosDB/FactoryExtensions/MultiTenancyFactoryExtension.cs
index e6c005b044..0d108c5fd5 100644
--- a/Modules/Intent.Modules.CosmosDB/FactoryExtensions/MultiTenancyFactoryExtension.cs
+++ b/Modules/Intent.Modules.CosmosDB/FactoryExtensions/MultiTenancyFactoryExtension.cs
@@ -186,7 +186,7 @@ private static void UpdateRepositoryBase(ICSharpFileBuilderTemplate template)
 
                 // FindByIdAsync
                 {
-                    var method = @class.FindMethod(m => m.Name =="FindByIdAsync" );
+                    var method = @class.FindMethod(m => m.Name == "FindByIdAsync");
                     var documentDeclarationStatement = method.FindStatement(x => x.HasMetadata(MetadataNames.DocumentDeclarationStatement));
                     documentDeclarationStatement.FindAndReplace("id, partitionKey, ", "id, partitionKey ?? _tenantId, ");
                 }
diff --git a/Modules/Intent.Modules.CosmosDB/Intent.CosmosDB.imodspec b/Modules/Intent.Modules.CosmosDB/Intent.CosmosDB.imodspec
index f078a12335..7d65ad504a 100644
--- a/Modules/Intent.Modules.CosmosDB/Intent.CosmosDB.imodspec
+++ b/Modules/Intent.Modules.CosmosDB/Intent.CosmosDB.imodspec
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package>
   <id>Intent.CosmosDB</id>
-  <version>1.0.3</version>
+  <version>1.0.4-pre.0</version>
   <supportedClientVersions>[4.1.0, 5.0.0-a)</supportedClientVersions>
   <summary>Core Cosmos DB Database Provider Repository backed using the Cosmos DB Client.</summary>
   <description>Core Cosmos DB Database Provider Repository backed using the Cosmos DB Client.</description>
@@ -122,7 +122,17 @@
     <factoryExtension id="Intent.CosmosDB.EntityFactoryExtension" externalReference="5632e697-26b1-4a38-9e12-6ce3d768d878" />
     <factoryExtension id="Intent.CosmosDB.MultiTenancyFactoryExtension" externalReference="cc56c90e-b5fe-4fb3-8cfc-cb5b02526727" />
   </factoryExtensions>
-  <moduleSettings></moduleSettings>
+  <moduleSettings>
+    <group id="e9f6758c-f8db-4cad-af33-827b867be548" title="CosmosDb" externalReference="e9f6758c-f8db-4cad-af33-827b867be548">
+      <settings>
+        <setting id="fcb114f7-77b4-4c6a-96c0-41bb146f4166" title="Use Optimistic Concurrency" type="switch">
+          <isRequired>true</isRequired>
+          <hint>Ensures updates are applied only when document etags match, for improved concurrency management</hint>
+          <defaultValue>true</defaultValue>
+        </setting>
+      </settings>
+    </group>
+  </moduleSettings>
   <interoperability>
     <!-- Minimum Compatible Versions -->
     <detect id="Intent.Application.Dtos.AutoMapper">
diff --git a/Modules/Intent.Modules.CosmosDB/Intent.Metadata/Module Builder/Intent.CosmosDB/Elements/Module Settings Configuration/CosmosDb__9py0clyp.xml b/Modules/Intent.Modules.CosmosDB/Intent.Metadata/Module Builder/Intent.CosmosDB/Elements/Module Settings Configuration/CosmosDb__9py0clyp.xml
new file mode 100644
index 0000000000..279c3f8dda
--- /dev/null
+++ b/Modules/Intent.Modules.CosmosDB/Intent.Metadata/Module Builder/Intent.CosmosDB/Elements/Module Settings Configuration/CosmosDb__9py0clyp.xml	
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<class id="e9f6758c-f8db-4cad-af33-827b867be548" type="Module Settings Configuration" typeId="37e678f8-370a-4b05-ae44-69bb3d2b39b6">
+  <name>CosmosDb</name>
+  <display>CosmosDb</display>
+  <isAbstract>false</isAbstract>
+  <sort-children>manually</sort-children>
+  <genericTypes />
+  <isMapped>false</isMapped>
+  <parentFolderId>b52e75f6-d86b-4c53-b4bd-8a8c2c267865</parentFolderId>
+  <packageId>b52e75f6-d86b-4c53-b4bd-8a8c2c267865</packageId>
+  <packageName>Intent.CosmosDB</packageName>
+  <stereotypes />
+  <metadata />
+  <childElements>
+    <childElement id="fcb114f7-77b4-4c6a-96c0-41bb146f4166" type="Module Settings Field Configuration" typeId="88e29cab-1342-40c7-b052-5fcd68ffafec">
+      <name>Use Optimistic Concurrency</name>
+      <display>Use Optimistic Concurrency</display>
+      <isAbstract>false</isAbstract>
+      <genericTypes />
+      <isMapped>false</isMapped>
+      <parentFolderId>e9f6758c-f8db-4cad-af33-827b867be548</parentFolderId>
+      <packageId>b52e75f6-d86b-4c53-b4bd-8a8c2c267865</packageId>
+      <packageName>Intent.CosmosDB</packageName>
+      <stereotypes>
+        <stereotype stereotypeDefinitionId="4805c791-5be3-4049-b929-6046d7be9944" name="Field Configuration">
+          <addedByDefault>true</addedByDefault>
+          <definitionPackageName>Intent.ModuleBuilder</definitionPackageName>
+          <definitionPackageId>9972b2a9-b749-4bba-b5c8-824bf694c6ef</definitionPackageId>
+          <properties>
+            <property name="e33ce4e3-a3c5-4a3c-a6b8-96418be03de0" display="Control Type" value="Switch" isActive="true" />
+            <property name="7070a9ce-ff31-422e-9cff-d82876c5efdf" display="Is Required" value="true" isActive="true" />
+            <property name="01489021-8311-43d5-b41b-e7628a512c1d" display="Hint" value="Ensures updates are applied only when document etags match, for improved concurrency management" isActive="true" />
+            <property name="653d889c-626f-45c5-a6e6-72b74a2f805c" display="Default Value" value="true" isActive="true" />
+          </properties>
+        </stereotype>
+      </stereotypes>
+      <metadata />
+      <childElements />
+    </childElement>
+  </childElements>
+</class>
\ No newline at end of file
diff --git a/Modules/Intent.Modules.CosmosDB/Intent.Metadata/Module Builder/Intent.CosmosDB/Intent.CosmosDB.pkg.config b/Modules/Intent.Modules.CosmosDB/Intent.Metadata/Module Builder/Intent.CosmosDB/Intent.CosmosDB.pkg.config
index 96fc03ce09..7ec287723d 100644
--- a/Modules/Intent.Modules.CosmosDB/Intent.Metadata/Module Builder/Intent.CosmosDB/Intent.CosmosDB.pkg.config	
+++ b/Modules/Intent.Modules.CosmosDB/Intent.Metadata/Module Builder/Intent.CosmosDB/Intent.CosmosDB.pkg.config	
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package id="b52e75f6-d86b-4c53-b4bd-8a8c2c267865" type="Intent Module" typeId="d2e543c7-174a-45b4-aebe-a13f9ee90214">
+  <applicationId>8f7ee5f1-6a37-4f38-b129-6c5d6898c355</applicationId>
+  <designerId>a1c3dd87-352e-4353-853b-c79853debecb</designerId>
   <name>Intent.CosmosDB</name>
   <icon type="UrlImagePath" source="data:image/png;base64,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" />
   <externalReference>dda565cb-1ed7-4751-b665-96fe7e447e5f</externalReference>
diff --git a/Modules/Intent.Modules.CosmosDB/Intent.Modules.CosmosDB.application.output.log b/Modules/Intent.Modules.CosmosDB/Intent.Modules.CosmosDB.application.output.log
index 5878f2e007..30a3ca0981 100644
--- a/Modules/Intent.Modules.CosmosDB/Intent.Modules.CosmosDB.application.output.log
+++ b/Modules/Intent.Modules.CosmosDB/Intent.Modules.CosmosDB.application.output.log
@@ -88,6 +88,14 @@
       <ProjectRelativeFilePath>Intent.Modules.CosmosDB.csproj</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
+    <FileLog>
+      <ProjectId>2152c39d-e6a2-464c-8f1d-2877dfae4011</ProjectId>
+      <CorrelationId>Intent.ModuleBuilder.Templates.Settings.ModuleSettingsExtensions#b52e75f6-d86b-4c53-b4bd-8a8c2c267865</CorrelationId>
+      <OverwriteBehaviour>always</OverwriteBehaviour>
+      <ApplicationRelativeFilePath>Settings/ModuleSettingsExtensions.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>ModuleSettingsExtensions.cs</ProjectRelativeFilePath>
+      <IsIgnored>false</IsIgnored>
+    </FileLog>
     <FileLog>
       <ProjectId>c99d833a-084c-4105-a6fd-a931949e4a9e</ProjectId>
       <CorrelationId>Intent.ModuleBuilder.CSharp.Templates.CSharpTemplatePartial#2e654e28-f7a3-466f-bf5c-d966de5ad7ea</CorrelationId>
diff --git a/Modules/Intent.Modules.CosmosDB/Intent.Modules.CosmosDB.csproj b/Modules/Intent.Modules.CosmosDB/Intent.Modules.CosmosDB.csproj
index b3c1eb796a..cbf5b89064 100644
--- a/Modules/Intent.Modules.CosmosDB/Intent.Modules.CosmosDB.csproj
+++ b/Modules/Intent.Modules.CosmosDB/Intent.Modules.CosmosDB.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Intent.Modules.Common" Version="3.4.3" />
-    <PackageReference Include="Intent.Modules.Common.CSharp" Version="3.3.42" />
+    <PackageReference Include="Intent.Modules.Common" Version="3.5.0" />
+    <PackageReference Include="Intent.Modules.Common.CSharp" Version="3.4.1.0" />
     <PackageReference Include="Intent.Modules.Entities.Repositories.Api" Version="4.1.3" />
     <PackageReference Include="Intent.Modules.Metadata.DocumentDB" Version="1.1.5" />
     <PackageReference Include="Intent.Modules.Modelers.Domain" Version="3.4.5" />
diff --git a/Modules/Intent.Modules.CosmosDB/NugetDependencies.cs b/Modules/Intent.Modules.CosmosDB/NugetDependencies.cs
index 571d7104f5..bec3b173cd 100644
--- a/Modules/Intent.Modules.CosmosDB/NugetDependencies.cs
+++ b/Modules/Intent.Modules.CosmosDB/NugetDependencies.cs
@@ -1,10 +1,20 @@
-using Intent.Modules.Common.VisualStudio;
+using Intent.Engine;
+using Intent.Modules.Common.CSharp.VisualStudio;
+using Intent.Modules.Common.VisualStudio;
 
 namespace Intent.Modules.CosmosDB
 {
     internal class NugetDependencies
     {
-        public static readonly INugetPackageInfo IEvangelistAzureCosmosRepository = new NugetPackageInfo("IEvangelist.Azure.CosmosRepository", "3.7.0");
+        public static NugetPackageInfo IEvangelistAzureCosmosRepository(IOutputTarget outputTarget) => new(
+            name: "IEvangelist.Azure.CosmosRepository",
+            version: outputTarget.GetProject().GetMaxNetAppVersion() switch
+            {
+                (5, 0) => "3.7.0",
+                (6, 0) => "3.7.0",
+                (7, 0) => "7.1.0",
+                _ => "8.1.3"
+            });
         /// <summary>
         /// This dependency is introduced to override the version installed by CosmosDB due to a possible security
         /// vulnerability. https://github.com/advisories/GHSA-5crp-9r3c-p9vr
diff --git a/Modules/Intent.Modules.CosmosDB/Settings/ModuleSettingsExtensions.cs b/Modules/Intent.Modules.CosmosDB/Settings/ModuleSettingsExtensions.cs
new file mode 100644
index 0000000000..a0913e04b8
--- /dev/null
+++ b/Modules/Intent.Modules.CosmosDB/Settings/ModuleSettingsExtensions.cs
@@ -0,0 +1,44 @@
+using System;
+using Intent.Configuration;
+using Intent.Engine;
+using Intent.Modules.Common.Templates;
+using Intent.RoslynWeaver.Attributes;
+
+[assembly: DefaultIntentManaged(Mode.Fully)]
+[assembly: IntentTemplate("Intent.ModuleBuilder.Templates.Settings.ModuleSettingsExtensions", Version = "1.0")]
+
+namespace Intent.Modules.CosmosDB.Settings
+{
+    public static class ModuleSettingsExtensions
+    {
+        public static CosmosDb GetCosmosDb(this IApplicationSettingsProvider settings)
+        {
+            return new CosmosDb(settings.GetGroup("e9f6758c-f8db-4cad-af33-827b867be548"));
+        }
+    }
+
+    public class CosmosDb : IGroupSettings
+    {
+        private readonly IGroupSettings _groupSettings;
+
+        public CosmosDb(IGroupSettings groupSettings)
+        {
+            _groupSettings = groupSettings;
+        }
+
+        public string Id => _groupSettings.Id;
+
+        public string Title
+        {
+            get => _groupSettings.Title;
+            set => _groupSettings.Title = value;
+        }
+
+        public ISetting GetSetting(string settingId)
+        {
+            return _groupSettings.GetSetting(settingId);
+        }
+
+        public bool UseOptimisticConcurrency() => bool.TryParse(_groupSettings.GetSetting("fcb114f7-77b4-4c6a-96c0-41bb146f4166")?.Value.ToPascalCase(), out var result) && result;
+    }
+}
\ No newline at end of file
diff --git a/Modules/Intent.Modules.CosmosDB/Templates/CosmosDBDocument/CosmosDBDocumentTemplatePartial.cs b/Modules/Intent.Modules.CosmosDB/Templates/CosmosDBDocument/CosmosDBDocumentTemplatePartial.cs
index 0890064263..e2d12f72ad 100644
--- a/Modules/Intent.Modules.CosmosDB/Templates/CosmosDBDocument/CosmosDBDocumentTemplatePartial.cs
+++ b/Modules/Intent.Modules.CosmosDB/Templates/CosmosDBDocument/CosmosDBDocumentTemplatePartial.cs
@@ -15,6 +15,7 @@
 using Intent.Modules.Common.CSharp.VisualStudio;
 using Intent.Modules.Common.Templates;
 using Intent.Modules.Constants;
+using Intent.Modules.CosmosDB.Settings;
 using Intent.Modules.CosmosDB.Templates.CosmosDBDocumentInterface;
 using Intent.Modules.CosmosDB.Templates.CosmosDBValueObjectDocument;
 using Intent.Modules.Modelers.Domain.Settings;
@@ -183,6 +184,24 @@ private void AddPropertiesForAggregate(CSharpClass @class)
                 }
             }
 
+            var useOptimisticConcurrency = ExecutionContext.Settings.GetCosmosDb().UseOptimisticConcurrency();
+            if (useOptimisticConcurrency)
+            {
+                // Etag implementation:
+                @class.AddField("string?", "_etag", field =>
+                {
+                    field.Private();
+                    field.AddAttribute($"{UseType("Newtonsoft.Json.JsonProperty")}(\"_etag\")");
+                });
+
+                @class.AddProperty("string?", "Etag", property =>
+                {
+                    property.ExplicitlyImplements("IItemWithEtag");
+                    property.Getter.WithExpressionImplementation("_etag");
+                    property.WithoutSetter();
+                });
+            }
+
             foreach (var entityProperty in entityProperties)
             {
                 var metadataModel = entityProperty.GetMetadata<IMetadataModel>("model");
diff --git a/Modules/Intent.Modules.CosmosDB/Templates/CosmosDBDocumentOfTInterface/CosmosDBDocumentOfTInterfaceTemplatePartial.cs b/Modules/Intent.Modules.CosmosDB/Templates/CosmosDBDocumentOfTInterface/CosmosDBDocumentOfTInterfaceTemplatePartial.cs
index 3c4d11d8a8..d07b33903e 100644
--- a/Modules/Intent.Modules.CosmosDB/Templates/CosmosDBDocumentOfTInterface/CosmosDBDocumentOfTInterfaceTemplatePartial.cs
+++ b/Modules/Intent.Modules.CosmosDB/Templates/CosmosDBDocumentOfTInterface/CosmosDBDocumentOfTInterfaceTemplatePartial.cs
@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using Intent.Engine;
 using Intent.Modules.Common;
 using Intent.Modules.Common.CSharp.Builder;
 using Intent.Modules.Common.CSharp.Templates;
 using Intent.Modules.Common.Templates;
+using Intent.Modules.CosmosDB.Settings;
 using Intent.Modules.Modelers.Domain.Settings;
 using Intent.RoslynWeaver.Attributes;
 using Intent.Templates;
@@ -23,6 +25,7 @@ public partial class CosmosDBDocumentOfTInterfaceTemplate : CSharpTemplateBase<o
         public CosmosDBDocumentOfTInterfaceTemplate(IOutputTarget outputTarget, object model = null) : base(TemplateId, outputTarget, model)
         {
             var createEntityInterfaces = ExecutionContext.Settings.GetDomainSettings().CreateEntityInterfaces();
+            var useOptimisticConcurrency = ExecutionContext.Settings.GetCosmosDb().UseOptimisticConcurrency();
 
             CSharpFile = new CSharpFile(this.GetNamespace(), this.GetFolderPath())
                 .AddUsing("System")
@@ -66,16 +69,31 @@ public CosmosDBDocumentOfTInterfaceTemplate(IOutputTarget outputTarget, object m
 
                     @interface.ImplementsInterfaces(UseType("ICosmosDBDocument"));
 
-                    @interface.AddMethod(tDocument, "PopulateFromEntity", c => c
+                    if (useOptimisticConcurrency)
+                    {
+                        @interface.AddMethod(tDocument, "PopulateFromEntity", c => c
+                            .AddParameter(tDomain, "entity")
+                            .AddParameter("string?", "etag", e => e.WithDefaultValue("null")));
+                    }
+                    else
+                    {
+                        @interface.AddMethod(tDocument, "PopulateFromEntity", c => c
                         .AddParameter(tDomain, "entity"));
+                    }
 
                     @interface.AddMethod(tDomainState, "ToEntity", c => c
                         .AddParameter($"{tDomainState}?", "entity", p => p.WithDefaultValue("null")));
                 })
                 .AddInterface($"ICosmosDBDocument", @interface =>
                 {
+                    var implementsInterface = UseType("Microsoft.Azure.CosmosRepository.IItem");
+                    if (useOptimisticConcurrency)
+                    {
+                        implementsInterface = UseType("Microsoft.Azure.CosmosRepository.IItemWithEtag");
+                    }
+
                     @interface.Internal();
-                    @interface.ImplementsInterfaces(UseType("Microsoft.Azure.CosmosRepository.IItem"));
+                    @interface.ImplementsInterfaces(implementsInterface);
 
                     @interface.AddProperty("string", "PartitionKey", method => method
                         .ExplicitlyImplements(UseType("Microsoft.Azure.CosmosRepository.IItem"))
diff --git a/Modules/Intent.Modules.CosmosDB/Templates/CosmosDBRepository/CosmosDBRepositoryTemplatePartial.cs b/Modules/Intent.Modules.CosmosDB/Templates/CosmosDBRepository/CosmosDBRepositoryTemplatePartial.cs
index 42059ee3d5..d8782572e2 100644
--- a/Modules/Intent.Modules.CosmosDB/Templates/CosmosDBRepository/CosmosDBRepositoryTemplatePartial.cs
+++ b/Modules/Intent.Modules.CosmosDB/Templates/CosmosDBRepository/CosmosDBRepositoryTemplatePartial.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Security.Cryptography;
 using Intent.Engine;
 using Intent.Metadata.DocumentDB.Api;
 using Intent.Metadata.DocumentDB.Api.Extensions;
@@ -9,18 +11,16 @@
 using Intent.Modules.Common.CSharp.Builder;
 using Intent.Modules.Common.CSharp.DependencyInjection;
 using Intent.Modules.Common.CSharp.Templates;
+using Intent.Modules.Common.CSharp.VisualStudio;
 using Intent.Modules.Common.Templates;
 using Intent.Modules.Constants;
+using Intent.Modules.CosmosDB.Settings;
 using Intent.Modules.Entities.Repositories.Api.Templates;
 using Intent.Modules.Entities.Repositories.Api.Templates.EntityRepositoryInterface;
 using Intent.Modules.Modelers.Domain.Settings;
 using Intent.RoslynWeaver.Attributes;
 using Intent.Templates;
-using Intent.Modules.Common.Templates; 
 using static Intent.Modules.CosmosDB.Templates.AttributeModelExtensionMethods;
-using System.Security.Cryptography;
-using Intent.Modules.Common.CSharp.VisualStudio;
-using System.Runtime.CompilerServices;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
 [assembly: IntentTemplate("Intent.ModuleBuilder.CSharp.Templates.CSharpTemplatePartial", Version = "1.0")]
@@ -81,6 +81,18 @@ public CosmosDBRepositoryTemplate(IOutputTarget outputTarget, ClassModel model)
                             .WithExpressionBody($"await base.FindByIdAsync({GetPKUsage(pkAttribute)}, cancellationToken: cancellationToken)");
                     });
 
+                    var useOptimisticConcurrency = ExecutionContext.Settings.GetCosmosDb().UseOptimisticConcurrency();
+                    if (useOptimisticConcurrency)
+                    {
+                        @class.AddMethod("string", "GetId", method =>
+                        {
+                            method
+                                .Override()
+                                .AddParameter(EntityTypeName, "entity")
+                                .WithExpressionBody($"entity.{pkAttribute.IdAttribute.Name.ToPascalCase()}");
+                        });
+                    }
+
                     if (pkAttribute.IdAttribute.TypeReference?.Element.Name != "string")
                     {
                         @class.AddMethod($"{UseType("System.Threading.Tasks.Task")}<{UseType("System.Collections.Generic.List")}<{EntityStateTypeName}>>", "FindByIdsAsync", method =>
diff --git a/Modules/Intent.Modules.CosmosDB/Templates/CosmosDBRepositoryBase/CosmosDBRepositoryBaseTemplatePartial.cs b/Modules/Intent.Modules.CosmosDB/Templates/CosmosDBRepositoryBase/CosmosDBRepositoryBaseTemplatePartial.cs
index debfc356a6..f7f9d8f07a 100644
--- a/Modules/Intent.Modules.CosmosDB/Templates/CosmosDBRepositoryBase/CosmosDBRepositoryBaseTemplatePartial.cs
+++ b/Modules/Intent.Modules.CosmosDB/Templates/CosmosDBRepositoryBase/CosmosDBRepositoryBaseTemplatePartial.cs
@@ -11,6 +11,7 @@
 using Intent.Modules.Common.CSharp.Templates;
 using Intent.Modules.Common.Templates;
 using Intent.Modules.Constants;
+using Intent.Modules.CosmosDB.Settings;
 using Intent.Modules.Entities.Repositories.Api.Templates;
 using Intent.Modules.Modelers.Domain.Settings;
 using Intent.RoslynWeaver.Attributes;
@@ -30,7 +31,8 @@ public partial class CosmosDBRepositoryBaseTemplate : CSharpTemplateBase<IList<C
         public CosmosDBRepositoryBaseTemplate(IOutputTarget outputTarget, IList<ClassModel> model) : base(TemplateId, outputTarget, model)
         {
             var createEntityInterfaces = ExecutionContext.Settings.GetDomainSettings().CreateEntityInterfaces();
-            AddNugetDependency(NugetDependencies.IEvangelistAzureCosmosRepository);
+            var useOptimisticConcurrency = ExecutionContext.Settings.GetCosmosDb().UseOptimisticConcurrency();
+            AddNugetDependency(NugetDependencies.IEvangelistAzureCosmosRepository(outputTarget));
             AddNugetDependency(NugetDependencies.NewtonsoftJson);
 
             CSharpFile = new CSharpFile(this.GetNamespace(), this.GetFolderPath())
@@ -86,6 +88,11 @@ public CosmosDBRepositoryBaseTemplate(IOutputTarget outputTarget, IList<ClassMod
                             .AddType("new()"))
                         ;
 
+                    if (useOptimisticConcurrency)
+                    {
+                        @class.AddField("Dictionary<string, string?>", "_etags");
+                    }
+
                     @class.AddConstructor(ctor =>
                     {
                         ctor.Protected();
@@ -94,6 +101,11 @@ public CosmosDBRepositoryBaseTemplate(IOutputTarget outputTarget, IList<ClassMod
                         ctor.AddParameter(UseType($"Microsoft.Azure.CosmosRepository.IRepository<{tDocument}>"),
                             "cosmosRepository", p => p.IntroduceReadonlyField());
                         ctor.AddParameter("string", "idFieldName", p => p.IntroduceReadonlyField());
+
+                        if (useOptimisticConcurrency)
+                        {
+                            ctor.AddStatement("_etags = new Dictionary<string, string?>();");
+                        }
                     });
 
                     @class.AddProperty(this.GetCosmosDBUnitOfWorkInterfaceName(), "UnitOfWork", p => p
@@ -101,6 +113,15 @@ public CosmosDBRepositoryBaseTemplate(IOutputTarget outputTarget, IList<ClassMod
                         .Getter.WithExpressionImplementation("_unitOfWork")
                     );
 
+                    if (useOptimisticConcurrency)
+                    {
+                        @class.AddMethod("string", "GetId", method =>
+                        {
+                            method.Abstract();
+                            method.AddParameter(tDomain, "entity");
+                        });
+                    }
+
                     @class.AddMethod("void", "Add", m => m
                         .AddParameter(tDomain, "entity")
                         .AddStatement("_unitOfWork.Track(entity);", s => s.SeparatedFromPrevious())
@@ -116,6 +137,9 @@ public CosmosDBRepositoryBaseTemplate(IOutputTarget outputTarget, IList<ClassMod
                         })
                     );
 
+                    var updatePopulateFromEntityStatement = useOptimisticConcurrency
+                        ? $"var document = new {tDocument}().PopulateFromEntity(entity, GetEtag(entity));"
+                        : $"var document = new {tDocument}().PopulateFromEntity(entity);";
                     @class.AddMethod("void", "Update", m => m
                         .AddParameter(tDomain, "entity")
                         .AddInvocationStatement("_unitOfWork.Enqueue", invocation =>
@@ -124,13 +148,16 @@ public CosmosDBRepositoryBaseTemplate(IOutputTarget outputTarget, IList<ClassMod
                             invocation.SeparatedFromPrevious();
                             invocation
                                 .AddArgument(new CSharpLambdaBlock("async cancellationToken")
-                                    .AddStatement($"var document = new {tDocument}().PopulateFromEntity(entity);", c => c.AddMetadata(MetadataNames.DocumentDeclarationStatement, true))
+                                    .AddStatement(updatePopulateFromEntityStatement, c => c.AddMetadata(MetadataNames.DocumentDeclarationStatement, true))
                                     .AddStatement(
                                         "await _cosmosRepository.UpdateAsync(document, cancellationToken: cancellationToken);")
                                 );
                         })
                     );
 
+                    var removePopulateFromEntityStatement = useOptimisticConcurrency
+                        ? $"var document = new {tDocument}().PopulateFromEntity(entity, GetEtag(entity));"
+                        : $"var document = new {tDocument}().PopulateFromEntity(entity);";
                     @class.AddMethod("void", "Remove", m => m
                         .AddParameter(tDomain, "entity")
                         .AddInvocationStatement("_unitOfWork.Enqueue", invocation =>
@@ -139,7 +166,7 @@ public CosmosDBRepositoryBaseTemplate(IOutputTarget outputTarget, IList<ClassMod
                             invocation.SeparatedFromPrevious();
                             invocation
                                 .AddArgument(new CSharpLambdaBlock("async cancellationToken")
-                                    .AddStatement($"var document = new {tDocument}().PopulateFromEntity(entity);", c => c.AddMetadata(MetadataNames.DocumentDeclarationStatement, true))
+                                    .AddStatement(removePopulateFromEntityStatement, c => c.AddMetadata(MetadataNames.DocumentDeclarationStatement, true))
                                     .AddStatement(
                                         "await _cosmosRepository.DeleteAsync(document, cancellationToken: cancellationToken);")
                                 );
@@ -150,8 +177,7 @@ public CosmosDBRepositoryBaseTemplate(IOutputTarget outputTarget, IList<ClassMod
                         .Async()
                         .AddParameter("CancellationToken", "cancellationToken", p => p.WithDefaultValue("default"))
                         .AddStatement("var documents = await _cosmosRepository.GetAsync(_ => true, cancellationToken);", c => c.AddMetadata(MetadataNames.DocumentsDeclarationStatement, true))
-                        .AddStatement($"var results = documents.Select{selectGenericTypeArgument}(document => document.ToEntity()).ToList();")
-                        .AddStatement("Track(results);")
+                        .AddStatement($"var results = LoadAndTrackDocuments(documents).ToList();")
                         .AddStatement("return results;", s => s.SeparatedFromPrevious())
                     );
 
@@ -168,8 +194,7 @@ public CosmosDBRepositoryBaseTemplate(IOutputTarget outputTarget, IList<ClassMod
                                 .AddStatement(
                                     "var document = await _cosmosRepository.GetAsync(id, partitionKey, cancellationToken: cancellationToken);",
                                     c => c.AddMetadata(MetadataNames.DocumentDeclarationStatement, true))
-                                .AddStatement("var entity = document.ToEntity();")
-                                .AddStatement("Track(entity);")
+                                .AddStatement("var entity = LoadAndTrackDocument(document);")
                                 .AddStatement("return entity;", s => s.SeparatedFromPrevious());
                         })
                         .AddCatchBlock(UseType("Microsoft.Azure.Cosmos.CosmosException"), "ex", c =>
@@ -190,8 +215,7 @@ public CosmosDBRepositoryBaseTemplate(IOutputTarget outputTarget, IList<ClassMod
                             .AddStatement(
                                 "var documents = await _cosmosRepository.GetAsync(AdaptFilterPredicate(filterExpression), cancellationToken);"
                                 , c => c.AddMetadata(MetadataNames.DocumentsDeclarationStatement, true))
-                            .AddStatement($"var results = documents.Select{selectGenericTypeArgument}(document => document.ToEntity()).ToList();")
-                            .AddStatement("Track(results);")
+                            .AddStatement($"var results = LoadAndTrackDocuments(documents).ToList();")
                             .AddStatement("return results;", s => s.SeparatedFromPrevious());
                     });
 
@@ -222,8 +246,10 @@ public CosmosDBRepositoryBaseTemplate(IOutputTarget outputTarget, IList<ClassMod
                             .AddStatement(
                                 "var pagedDocuments = await _cosmosRepository.PageAsync(AdaptFilterPredicate(filterExpression), pageNo, pageSize, true, cancellationToken);",
                                 c => c.AddMetadata(MetadataNames.PagedDocumentsDeclarationStatement, true))
-                            .AddStatement("Track(pagedDocuments.Items.Select(document => document.ToEntity()));")
-                            .AddStatement($"return new {this.GetCosmosPagedListName()}<{tDomain}{tDomainStateGenericTypeArgument}, {tDocument}>(pagedDocuments, pageNo, pageSize);", s => s.SeparatedFromPrevious());
+                            .AddStatement("var entities = LoadAndTrackDocuments(pagedDocuments.Items).ToList();")
+                            .AddStatement("var totalCount = pagedDocuments.Total ?? 0;", s => s.SeparatedFromPrevious())
+                            .AddStatement("var pageCount = pagedDocuments.TotalPages ?? 0;")
+                            .AddStatement($"return new {this.GetCosmosPagedListName()}<{tDomain}{tDomainStateGenericTypeArgument}, {tDocument}>(entities, totalCount, pageCount, pageNo, pageSize);", s => s.SeparatedFromPrevious());
                     });
 
                     @class.AddMethod($"Task<List<{tDomain}>>", "FindByIdsAsync", m => m
@@ -236,8 +262,7 @@ public CosmosDBRepositoryBaseTemplate(IOutputTarget outputTarget, IList<ClassMod
                             c => c.AddMetadata(MetadataNames.QueryDefinitionDeclarationStatement, true))
                         .AddStatement(
                             "var documents = await _cosmosRepository.GetByQueryAsync(queryDefinition, cancellationToken);")
-                        .AddStatement($"var results = documents.Select{selectGenericTypeArgument}(document => document.ToEntity()).ToList();")
-                        .AddStatement("Track(results);")
+                        .AddStatement($"var results = LoadAndTrackDocuments(documents).ToList();")
                         .AddStatement("return results;", s => s.SeparatedFromPrevious())
                     );
 
@@ -261,20 +286,44 @@ public CosmosDBRepositoryBaseTemplate(IOutputTarget outputTarget, IList<ClassMod
 
                     });
 
-                    @class.AddMethod("void", "Track", method =>
+                    @class.AddMethod(tDomain, "LoadAndTrackDocument", method =>
                     {
-                        method.AddParameter($"IEnumerable<{tDomain}>", "items");
+                        method.AddParameter($"{tDocument}", "document");
+
+                        method.AddStatement("var entity = document.ToEntity();");
 
-                        method.AddForEachStatement("item", "items", stmt => stmt.AddStatement("_unitOfWork.Track(item);"));
+                        method.AddStatement("_unitOfWork.Track(entity);", s => s.SeparatedFromPrevious());
+
+                        if (useOptimisticConcurrency)
+                        {
+                            method.AddStatement("_etags[document.Id] = document.Etag;");
+                        }
+
+                        method.AddStatement("return entity;", s => s.SeparatedFromPrevious());
 
                     });
 
-                    @class.AddMethod("void", "Track", method =>
+                    @class.AddMethod($"IEnumerable<{tDomain}>", "LoadAndTrackDocuments", method =>
                     {
-                        method.AddParameter($"{tDomain}", "item");
-                        method.AddStatement("_unitOfWork.Track(item);");
+                        method.AddParameter($"IEnumerable<{tDocument}>", "documents");
+
+                        method.AddForEachStatement("document", "documents", stmt => stmt.AddStatement("yield return LoadAndTrackDocument(document);"));
                     });
 
+                    if (useOptimisticConcurrency)
+                    {
+                        @class.AddMethod($"string?", "GetEtag", method =>
+                        {
+                            method.AddParameter(tDomain, "entity");
+
+                            method.AddIfStatement("_etags.TryGetValue(GetId(entity), out var etag)", @if =>
+                            {
+                                @if.AddStatement("return etag;");
+                            });
+
+                            method.AddStatement("return default;", s => { s.SeparatedFromPrevious(); });
+                        });
+                    }
 
                     @class.AddNestedClass("SubstitutionExpressionVisitor", nestClass =>
                     {
diff --git a/Modules/Intent.Modules.CosmosDB/Templates/CosmosPagedList/CosmosPagedListTemplatePartial.cs b/Modules/Intent.Modules.CosmosDB/Templates/CosmosPagedList/CosmosPagedListTemplatePartial.cs
index 263cc2e24d..b324af25af 100644
--- a/Modules/Intent.Modules.CosmosDB/Templates/CosmosPagedList/CosmosPagedListTemplatePartial.cs
+++ b/Modules/Intent.Modules.CosmosDB/Templates/CosmosPagedList/CosmosPagedListTemplatePartial.cs
@@ -41,7 +41,7 @@ public CosmosPagedListTemplate(IOutputTarget outputTarget, object model = null)
                         @class
                             .AddGenericParameter("TDomainState", out tDomainState);
                     }
-                    
+
                     @class
                         .AddGenericParameter("TDocument", out var tDocument)
                         .WithBaseType($"List<{tDomain}>")
@@ -71,18 +71,20 @@ public CosmosPagedListTemplate(IOutputTarget outputTarget, object model = null)
                     @class.AddProperty("int", "PageSize", prop => prop.WithoutSetter());
                     @class.AddConstructor(ctor =>
                     {
-                        ctor.AddParameter($"IPageQueryResult<{tDocument}>", "pagedResult")
+                        ctor.AddParameter($"IEnumerable<{tDomain}>", "pagedResult")
+                            .AddParameter("int", "totalCount")
+                            .AddParameter("int", "pageCount")
                             .AddParameter("int", "pageNo")
                             .AddParameter("int", "pageSize");
 
-                        ctor.AddStatement("TotalCount = pagedResult.Total ?? 0;");
-                        ctor.AddStatement("PageCount = pagedResult.TotalPages ?? 0;");
+                        ctor.AddStatement("TotalCount = totalCount;");
+                        ctor.AddStatement("PageCount = pageCount;");
                         ctor.AddStatement("PageNo = pageNo;");
                         ctor.AddStatement("PageSize = pageSize;");
 
-                        ctor.AddForEachStatement("result", "pagedResult.Items", stmt =>
+                        ctor.AddForEachStatement("result", "pagedResult", stmt =>
                         {
-                            stmt.AddStatement("Add(result.ToEntity());");
+                            stmt.AddStatement("Add(result);");
                         });
                     });
                 });
diff --git a/Modules/Intent.Modules.CosmosDB/Templates/DocumentTemplateHelpers.cs b/Modules/Intent.Modules.CosmosDB/Templates/DocumentTemplateHelpers.cs
index d84828c6b5..fb3046257c 100644
--- a/Modules/Intent.Modules.CosmosDB/Templates/DocumentTemplateHelpers.cs
+++ b/Modules/Intent.Modules.CosmosDB/Templates/DocumentTemplateHelpers.cs
@@ -1,14 +1,18 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using Intent.CosmosDB.Api;
+using Intent.Engine;
 using Intent.Metadata.DocumentDB.Api;
 using Intent.Metadata.Models;
 using Intent.Modelers.Domain.Api;
 using Intent.Modules.Common.CSharp.Builder;
 using Intent.Modules.Common.CSharp.Templates;
 using Intent.Modules.Common.Templates;
+using Intent.Modules.CosmosDB.Settings;
 using Intent.Modules.CosmosDB.Templates.CosmosDBDocumentInterface;
+using Intent.Modules.CosmosDB.Templates.CosmosDBValueObjectDocument;
 using Intent.Modules.CosmosDB.Templates.CosmosDBValueObjectDocumentInterface;
 
 namespace Intent.Modules.CosmosDB.Templates
@@ -114,6 +118,7 @@ public static void AddCosmosDBMappingMethods<TModel>(
             bool isAggregate,
             bool hasBaseType)
         {
+            var useOptimisticConcurrency = template.ExecutionContext.Settings.GetCosmosDb().UseOptimisticConcurrency();
             var genericTypeArguments = @class.GenericParameters.Any()
                 ? $"<{string.Join(", ", @class.GenericParameters.Select(x => x.TypeName))}>"
                 : string.Empty;
@@ -222,6 +227,11 @@ public static void AddCosmosDBMappingMethods<TModel>(
             {
                 method.AddParameter($"{entityInterfaceTypeName}{genericTypeArguments}", "entity");
 
+                if (useOptimisticConcurrency && template.Id != CosmosDBValueObjectDocumentTemplate.TemplateId && isAggregate)
+                {
+                    method.AddParameter($"string?", "etag", parameter => parameter.WithDefaultValue("null"));
+                }
+
                 foreach (var attribute in attributes)
                 {
                     var suffix = string.Empty;
@@ -278,6 +288,11 @@ public static void AddCosmosDBMappingMethods<TModel>(
                     method.AddStatement($"{associationEnd.Name} = {documentTypeName}.FromEntity(entity.{associationEnd.Name}){nullableSuppression};");
                 }
 
+                if (useOptimisticConcurrency && template.Id != CosmosDBValueObjectDocumentTemplate.TemplateId && isAggregate)
+                {
+                    method.AddStatement("_etag = etag;", s => s.SeparatedFromPrevious());
+                }
+
                 if (hasBaseType)
                 {
                     method.AddStatement("base.PopulateFromEntity(entity);");
@@ -291,10 +306,20 @@ public static void AddCosmosDBMappingMethods<TModel>(
                 @class.AddMethod($"{@class.Name}{genericTypeArguments}?", "FromEntity", method =>
                 {
                     method.AddParameter($"{entityInterfaceTypeName}{genericTypeArguments}?", "entity");
+
                     method.Static();
 
                     method.AddIfStatement("entity is null", @if => @if.AddStatement("return null;"));
-                    method.AddStatement($"return new {@class.Name}{genericTypeArguments}().PopulateFromEntity(entity);", s => s.SeparatedFromPrevious());
+
+                    if (useOptimisticConcurrency && template.Id != CosmosDBValueObjectDocumentTemplate.TemplateId && isAggregate)
+                    {
+                        method.AddParameter($"string?", "etag", parameter => parameter.WithDefaultValue("null"));
+                        method.AddStatement($"return new {@class.Name}{genericTypeArguments}().PopulateFromEntity(entity, etag);", s => s.SeparatedFromPrevious());
+                    }
+                    else
+                    {
+                        method.AddStatement($"return new {@class.Name}{genericTypeArguments}().PopulateFromEntity(entity);", s => s.SeparatedFromPrevious());
+                    }
                 });
             }
         }
diff --git a/Modules/Intent.Modules.CosmosDB/release-notes.md b/Modules/Intent.Modules.CosmosDB/release-notes.md
index a3ac02da9f..5b3ed9746e 100644
--- a/Modules/Intent.Modules.CosmosDB/release-notes.md
+++ b/Modules/Intent.Modules.CosmosDB/release-notes.md
@@ -1,4 +1,8 @@
-### Version 1.0.3
+### Version 1.0.4
+
+- New Feature: Added support fo Optimistic Concurrency using `ETag` for `CosmosDB` module.
+
+### Version 1.0.3
 
 - Fixed: Fixed an issue around nullable collections not being realized correctly.
 
diff --git a/Modules/Intent.Modules.Dapr.AspNetCore.Pubsub/release-notes.md b/Modules/Intent.Modules.Dapr.AspNetCore.Pubsub/release-notes.md
index ca6427d37e..47978e4621 100644
--- a/Modules/Intent.Modules.Dapr.AspNetCore.Pubsub/release-notes.md
+++ b/Modules/Intent.Modules.Dapr.AspNetCore.Pubsub/release-notes.md
@@ -1,7 +1,3 @@
-### Version 2.0.3
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 2.0.0
 
 - Improvement: Updated to support use of top-level statements and minimal hosting model improvements introduced in [`Intent.AspNetCore` version 6.0.0](https://github.com/IntentArchitect/Intent.Modules.NET/blob/development/Modules/Intent.Modules.AspNetCore/release-notes.md#version-600).
diff --git a/Modules/Intent.Modules.Dapr.AspNetCore.ServiceInvocation/Intent.Dapr.AspNetCore.ServiceInvocation.imodspec b/Modules/Intent.Modules.Dapr.AspNetCore.ServiceInvocation/Intent.Dapr.AspNetCore.ServiceInvocation.imodspec
index 4f650203d0..37d7b94ecc 100644
--- a/Modules/Intent.Modules.Dapr.AspNetCore.ServiceInvocation/Intent.Dapr.AspNetCore.ServiceInvocation.imodspec
+++ b/Modules/Intent.Modules.Dapr.AspNetCore.ServiceInvocation/Intent.Dapr.AspNetCore.ServiceInvocation.imodspec
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package>
   <id>Intent.Dapr.AspNetCore.ServiceInvocation</id>
-  <version>2.2.0-pre.2</version>
+  <version>2.2.0-pre.3</version>
   <supportedClientVersions>[4.0.0-beta.4, 5.0.0-a)</supportedClientVersions>
   <summary>Generation of client service proxies for Dapr "Service-to-service invocation".</summary>
   <description>Generation of client service proxies for Dapr "Service-to-service invocation".</description>
diff --git a/Modules/Intent.Modules.Dapr.AspNetCore.ServiceInvocation/release-notes.md b/Modules/Intent.Modules.Dapr.AspNetCore.ServiceInvocation/release-notes.md
index a4a8bebf2c..7bae98c310 100644
--- a/Modules/Intent.Modules.Dapr.AspNetCore.ServiceInvocation/release-notes.md
+++ b/Modules/Intent.Modules.Dapr.AspNetCore.ServiceInvocation/release-notes.md
@@ -1,6 +1,7 @@
 ### Version 2.2.0
 
 - Improvement: Underlying proxy templates updated to support alternate Metadata models.
+- Improvement: Upgraded Microsoft.Extensions.Http NuGet package to version 8.0.0
 
 ### Version 2.1.0
 
diff --git a/Modules/Intent.Modules.Dapr.AspNetCore.StateManagement/Intent.Dapr.AspNetCore.StateManagement.imodspec b/Modules/Intent.Modules.Dapr.AspNetCore.StateManagement/Intent.Dapr.AspNetCore.StateManagement.imodspec
index 40ce69d3b8..77a63a7017 100644
--- a/Modules/Intent.Modules.Dapr.AspNetCore.StateManagement/Intent.Dapr.AspNetCore.StateManagement.imodspec
+++ b/Modules/Intent.Modules.Dapr.AspNetCore.StateManagement/Intent.Dapr.AspNetCore.StateManagement.imodspec
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package>
   <id>Intent.Dapr.AspNetCore.StateManagement</id>
-  <version>1.2.3-pre.0</version>
+  <version>1.2.2</version>
   <supportedClientVersions>[4.1.0, 5.0.0-a)</supportedClientVersions>
   <summary>Create long running, stateless and stateful services.</summary>
   <description>Create long running, stateless and stateful services.</description>
diff --git a/Modules/Intent.Modules.Dapr.AspNetCore.StateManagement/release-notes.md b/Modules/Intent.Modules.Dapr.AspNetCore.StateManagement/release-notes.md
index e3e7687b66..0c27e92948 100644
--- a/Modules/Intent.Modules.Dapr.AspNetCore.StateManagement/release-notes.md
+++ b/Modules/Intent.Modules.Dapr.AspNetCore.StateManagement/release-notes.md
@@ -1,11 +1,3 @@
-### Version 1.2.3
-
-- Improvement: Fixed small code formatting use around using blocks.
-
-### Version 1.2.2
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 1.1.0
 
 - Improvement: Added Document DB Provider support, allowing this module to be used in conjunction with other Document DB technologies within the same application.
diff --git a/Modules/Intent.Modules.DocumentDB.Dtos.AutoMapper/Intent.DocumentDB.Dtos.AutoMapper.imodspec b/Modules/Intent.Modules.DocumentDB.Dtos.AutoMapper/Intent.DocumentDB.Dtos.AutoMapper.imodspec
index 7fcb8f40ec..5eb3bf4f10 100644
--- a/Modules/Intent.Modules.DocumentDB.Dtos.AutoMapper/Intent.DocumentDB.Dtos.AutoMapper.imodspec
+++ b/Modules/Intent.Modules.DocumentDB.Dtos.AutoMapper/Intent.DocumentDB.Dtos.AutoMapper.imodspec
@@ -8,7 +8,6 @@
   <authors>Intent Architect</authors>
   <iconUrl>data:image/png;base64,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</iconUrl>
   <tags>csharp dotnet documentdb dto automapper</tags>
-  <releaseNotes>release-notes.md</releaseNotes>
   <templates></templates>
   <decorators></decorators>
   <factoryExtensions>
diff --git a/Modules/Intent.Modules.DocumentDB.Dtos.AutoMapper/release-notes.md b/Modules/Intent.Modules.DocumentDB.Dtos.AutoMapper/release-notes.md
deleted file mode 100644
index bb9a99804a..0000000000
--- a/Modules/Intent.Modules.DocumentDB.Dtos.AutoMapper/release-notes.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### Version 1.0.0
-
-- New Feature: Module released.
diff --git a/Modules/Intent.Modules.DomainServices/release-notes.md b/Modules/Intent.Modules.DomainServices/release-notes.md
index c0267223cf..9dac523a5f 100644
--- a/Modules/Intent.Modules.DomainServices/release-notes.md
+++ b/Modules/Intent.Modules.DomainServices/release-notes.md
@@ -1,8 +1,4 @@
-### Version 1.1.3
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-- 
-### Version 1.1.2
+### Version 1.1.2
 
 - Improvement: Specify which Domain Services should only have their Interfaces generated by applying the `Contract Only` stereotype.
 
diff --git a/Modules/Intent.Modules.Entities.BasicAuditing/release-notes.md b/Modules/Intent.Modules.Entities.BasicAuditing/release-notes.md
index 8502f48929..c6aab1dfdb 100644
--- a/Modules/Intent.Modules.Entities.BasicAuditing/release-notes.md
+++ b/Modules/Intent.Modules.Entities.BasicAuditing/release-notes.md
@@ -1,7 +1,3 @@
-### Version 1.0.4
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 1.0.2
 
 - Fixed: Any manually added attributes called `CreatedBy`, `CreatedDate`, `UpdatedBy` or `UpdatedDate` would be automatically removed on creation, regardless of whether or not auditing was ever applied to an entity.
diff --git a/Modules/Intent.Modules.Entities.Constants/Intent.Entities.Constants.imodspec b/Modules/Intent.Modules.Entities.Constants/Intent.Entities.Constants.imodspec
index 91d955b0a4..fe56d2dacc 100644
--- a/Modules/Intent.Modules.Entities.Constants/Intent.Entities.Constants.imodspec
+++ b/Modules/Intent.Modules.Entities.Constants/Intent.Entities.Constants.imodspec
@@ -7,7 +7,6 @@
   <description>Module for introducing constants instead on numeric literals.</description>
   <tags>csharp dotnet domain entities entity</tags>
   <authors>Intent Architect</authors>
-  <releaseNotes>release-notes.md</releaseNotes>
   <iconUrl>data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAACXBIWXMAAA7EAAAOxAGVKw4bAAAbEElEQVR42u3daXDc933f8c/u4iRAEgRP8BLv+xIpkZIl0Tps02ecOGfTTNK605m0k0edaZ/kYZ+lM3mWR00z04yaSdxMbMuxFMvRbYsURfE+wPu+QQIEcR+7faC0jcaJHC0lCyu8XjN+JO9PwHcXwhv/61f4/XV/WAkAMKkUjQAABAAAIAAAAAEAAAgAAEAAAAACAAAQAACAAAAABAAAIAAAAAEAAAgAAEAAAAACAAAQAACAAAAABAAACAAAQAAAAAIAABAAAIAAAAAEAAAgAAAAAQAACAAAQAAAAAIAABAAAIAAAAAEAAAgAAAAAQAACAAAEAAAgAAAAAQAACAAAAABAAAIAABAAAAAAgAAEAAAgAAAAAQAACAAAAABAAAIAABAAAAAAgAAEAAAIAAAAAEAAAgAAEAAAAACAAAQAACAAAAABAAAIAAAAAEAAAgAAEAAAAACAAAQAACAAAAABAAAIAAAQAAAAAIAABAAAIAAAAAEAAAgAAAAAQAACAAAQAAAAAIAABAAAIAAAAAEAAAgAAAAAQAACAAAQAAAgAAwAgAQAACAAAAABAAAIAAAAAEAAAgAAEAAAAACAAAQAACAAAAABAAAIAAAAAEAAAgAAEAAAAACAAAQAAAgAAAAAQAACAAAQAAAAAIAABAAAIAAAAAEAAAgAAAAAQAACAAAQAAAAAIAABAAAIAAAAAEAAAgAABAAAAAAgAAEAAAgAAAAAQAACAAAAABAAAIAABAAAAAAgAAEAAAgAAAAAQAACAAAAABAAAIAABAAACAAAAABAAAIAAAAAEAAAgAAEAAAAACAAAQAACAAAAABAAAIAAAAAEAAAgAAEAAAAACAAAQAACAAAAAAQAACAAAQAAAAAIAABAAAIAAAAAEAAAgAAAAAQAACAAAQAAAAAIAABAAAIAAAAAEAAAgAAAAAQAAAsAIAEAAAAACAAAQAACAAAAABAAAIAAAAAEAAAgAAEAAAAACAAAQAACAAAAABAAAIAAAAAEAAAgAACCpM4LJoXXGlMxdMitTZ7Z+LOvdv9ufa2duZrB3yHD/QX1TfRat7ci0KmY8MjiS25fv5valu5/y91CXjmVz0j6/bVK/l4P3h3Lu4KWMDo99pNeV6oppn9+WBavm+YH4hJ0/fDm9XX2plCuGIQD4MDMXzMj2b2zJ0s2LPpb1uq7czTsvHMyhV08kfv6SJM2tjdn+9c1ZtmXxR35t7+372fvDQ596ADS3NmXzs2uz8Zk1k/q9vHm+K1dP3/zIAVDfVJ+lmxblC//2ST8Qn7C/+W8vZeDe4Ed+jxAAk05jS2NmL27PojUdH8t6cxbPTHm8kiudN3LnarcBJ6mrL2X2oupmfHdac6a2t37q30OpvpQZHW0f2+ekpt/PutJHfk2xVEzrjBbz+0XE6tTmFAoFg3gArgGguqCY0pClGxfmka9uTF2jjgQQAEwabfOmZduuDVm8dr5hAAgAJs2Hp1jM7MUz8+zvPJ7GlkYDARAATBZNLY1Z8ciSbNu1PnE6DkAAMHlMbW/Jl769s6rb3wAQANTqh6hUzIyO6fnWf/6KYQAIACaT+sa6bH52TdY/tdKpAAABwGRRKBTS0FSfX/lPu9I8tclAAAQAkykC5i2dnWf/9eNpaK43EAABwGQJgFJ9KU/++qNZuKYjpfqSoQAIACaL6XOm5gu/94S7AgAmMM9w5RM5ErDmseXZ+PSa7HvxcAZ6Bw1lEhgdGs3NC105te9CzX8vPTfvZXhg+KPPYHgslzuv59Xnd0+gn8eksbkhn/vWtqpeP9Q/nGM/OZV7t/sm1Ht0+9KdjI+P+8ETAEw0zVOb8rlvbc3VUzdy4ciVjI/6Qf3MB8DwWK50Xs9rz79d89/L2Mh4hgdGqnjdWC6fuJbuGz0TKsinzWp9oADY/6OjuXT82oR6j3q7+jI+VvaDJwCYiBat6ci2L29Iz63e3Llix8DPunK5nMG+oXRdnrzvdaVcyVDfcIb6hifM11QoJKMj1W+ZWx4vp+fm/Un9vn5WuQaAT+7DVSrm4S+uy8ptS9waCCAAqDV9PQMZHhyp6rVtc6bnka9uzPyVc1Is+bgBCABqxqVjV3PnanfK49Wdb1u1fVnWPbkq02dPNUwAAUCtuHHudq6evFH11fz1DXXZ+qX1WfHIktQ3uuwEQABQE5paG3Pp+LVcP3MrlUqlqjXmLZ2dTU+vyfwVc+0VACAAqIkAmNKYi8eu5dLxaxkdrv5q4g07V2X9zlVpbnVBIIAAYMKrb6rP6PBozrx3MVdP3qj6KEBTS2M2PbMm655Y4SgAgABgomtoqk+prpTOd87m5N5zKT/AwzceWr8gm59blzmLZxosgABgQgdAc33q6ksZ6htO59vvR8CDWPv4iuz45sMp1fn4AQgAJqxSXSmF4vvH7M8dupTDr3Wmr6e/6vVapjdn7WPLs+Hzqw0XQAAwcQOg+P8e4jM6PJaT75zLgZePVb1eoVjIgtXz8shXNqZt7jQDBhAATMgPSbGQwj+6aO/25bs5/PrJXDx6teo16xvrsmzL4jz2zYddEAggAJiI6hrqPvAY3/HR8Vw4fDl7//ZQhvur2/Tk/R3KpmbDzlVZ9cgSQwYQAEw0hVIxhcIH/0zv7xlM556zOfRaZ/VhUV9Kx4o5efxb2zJlWrNBAwgAJrpKpZKuy3ez78XDuXm+q+p1mluasnLbkmzdtcFQAQQAtWBkaDQXjl7JnhcOZKzK/cYLxUKmzZ6aHb+0JR0r5hgqgACgFvR3D+TgK8dzau/5qteob6jLglVz89SvPZo6mwUBCAAmhlJdKcXiP/1RKZcruXu1J2/81d7cu32/6n9H45SGbN21Pqt3LDNwAAHARFBXX0qx9M/fqzcyNJrTe89n398dSXm8XNVeAcViMa3tLfnCv3kiU2e2uDUQQABQC4YGhvP687tz4+ytBzrSsPrRZdn25Y2pq3cqAEAAMOFVypXcvd6Tl//srQz1D1e9Y2AKya5/91TmLpn5gWcPACAAmKDK45Xs/eHhnN57PmMj41VFQKFQSNvc6Xn2d59I64wpTgUACABq5UjAd//45fTeuV/9UYAkj/3SlqzY+lAamuoNFUAAUAtunL+dN/5ibwbuDVYdAcVSMV/9j8+mvaPNQAEEALXi1effzsVjVzM6PFb1GgtWzs0Tv/qIHQMBBAC1Ynx0PH/7J6+m68rdBzoV8OSvbcvSTYtS71QAgACgNlw+fi37XjqanlsP8ICglsZ8/l/tyPzlHhMMIACojaMAY+Xs/u57uXj0SkaGRqtao1AoZOnmRdn49OrMmOdUAIAAoCbcu9Wbt/9mf64/wAOCGprq8+jXNmfp5sUp1ZcMFUAAMNFVKsnpfedz7K1T6bl5r+p1Zi5oy8NfWp+Fq+cZKoAAoBYM9Q1n/8vHcu7Q5YxWuW1wqa6U1duXZe3nVmRqe4uhAggAasGNs7dy8JUTuXb6ZtVrTG1vyaZn1mTFtoc+dHMiAAQAE8T4WDkn95zN8Z+eyf27fVWvs2DVvGz8/JrMXTrbUAEEALWgt6svR9/ozJn9FzM+Nl7VGg1N9Vm1fWk27lydptZGQwUQANSCSyeu5/Crnbl16U7Va7TPb8v6nauydNMiAwUQANSCseGxnHr3fA6/2pmhvqGq1igUClm0dn62fXmjxwQDCABqxd1rPTn6xsmcP3w5lXJ1jwlubm3Mim0PZctz61Ln2QAAAoDacOnEtbzzwqHcv1P9BYGzF7dn66716fCYYAABQG0YGRzN2QMXs/fFw1VfEFgsFjN/5bzs/K3tabBZEIAAoDZ0XenOey8dybXTt6reMbBlenNW7ViWTc+sNtAJoFAopFiqvf8VioXEoyWYZOqMgE/TtTO38qM/fSPf/qPfSKHKh/vMnD8jz/3ek+nccy593QOG+mn9x6S+LjMXtmfj02tq7msfHhjO7Ut3c+dqjzcSAQC/CCODIzmz/2Le/Ku9efq3H6tqjWKpkDlLZuXrf/Bc/vK//sBQPyWNLQ3Z8NSqrH9yZc197bcu3skrf/52fvK/3/VGIgDgF6W3qy9vfefdrHtyZeYsnvmRX18oFNLc2pjNz67NwR8fT+ees4b6KSgU3j+MXqjBY+mFYiEFJ0SZZHzk+dRVypV0XenOD//k1aqvBSgUCmmd0ZKv/cFzaZjigkAAAUBNGBkayYndZ7LvpaNVr1GqK2bh6nl55rcff/+iLgAEABP9MEDS3z2QH//Zm+ntul/VA4IKhUIam+rz1G9uT8fyOSmKAAABwMRXLldy9fTNvPr87oyNVvdsgBSS9o7p+eK3n0xTa5OhAggAaiICxsp554WDOXvwYkZHxqo6ClAoFLLx6TXZsHNVGpobDBVAAFALem725vXn96S3637K5XJVa7RMa87O39qR2YvbUyz5mAMIAGrC8Z+ezqFXTmTw/nDVayzZtDCPfGVDWmdMMVAAAUAtGB0ey0/+el+udF7P6PBoVWuUSsVs//qWLN28KI1TnAoAEADUhOtnbuXdHx5K9417KVe5bXB7R1t2fGNLZi9ud2sggACgVrz3d0dy6t0LGbw/VPUaG3auytrHVzgVAPCPeBQwE9pQ/0h2f3d/Zi9qz/KtD6WuvvSR16hvrM+Ob2zJjfO3c+KnZ6q/xZAPVSlXMjoylpHBkZr72gd6BzM6POZNRADARHLu4KUceaMz7R3TM2tR+/vPnP+IFqyel83Prk3Xle5cP3PLUD8BoyNjuX72Vk7W4F4M97sHcuPcbW8iAgAmmndeOJj5K+Zm+pxpaWiq7ln/W7+0IVdP3czdaz0ZHhgx1I/ZyOBIzh24mO/+8cuGATXANQDUhL7ugex78XDOH75c9YZBzVObsnXX+qzY9pCBAgLACKgVnXvO5cjrJ9Nzq7fqNVZsXZLNz63LzIUzDBQQAFALKpVK3vvRkRx+rTPl8XLV62x6ek0e/sI6TwgEBADUinu37ufwa505ve9C1WtMndmS9U+tyuodywwUEABQE0cBypWcO3Axh145nt47fdV96IvFLN20MA9/cV2mzWo1VEAAQC0Y6h/JibfP5ODfH0+lyicENjQ3ZNWOZdm6a4OBAgIAakXX1e4ceb0zF45cqer1hUIh7R1t2bBzdZZsWmiggACAWjA2Mp4LR65m30uHM9A7WNUa9Q11WbxufrZ/fXOaWhsNFRAAUAv6evpzYvfZHHnjZNVrtLRNyZrHlmfT02sMFBAAUBMqSdeV7ux78XDVj3EtFguZOb8tj359c+Y8NNNMAQEAtWB0aDQXj17NnhcOZGRotKo1Gpob8tD6+dnxS1tS11AyVEAAQC3o6x7IgZeP5cx7F6peo2X6lGz78sYs27LYQAEBALWgUqmk++a9vPb87ty7fb+6H4RSMTPmTc8zv/N4WtumGCogAKAWjA6N5cz+i3n3xcMZHxuvasOghqb6rH18eR7+0vqqthwGEADwKRjuH8kr//OnuXmhq+o16pvqs+vf70x7x/REAwACACa+SqWS3tv388M/eS0jg6NVHQUoFotpn9eWL377qTQ2NxgqIACgFpTLlex/+WhOvH0mY6PVnQpIIXnqNx7Nko0LU6p3VwAgAKBm/PUfvZj7d/pS1e//QiHFUjG/+l++ktYZLYYJCACoFXeu9uTv/vsb6e/pr3qNhavn5anfeDStM9wVAAgAqBl7vn8gZw9cyvDASFWvLxQKeea3d2Th6nkeEAQIAKgVo0Nj+dGfvpmuK3dTrnLb4OapzXnud5/IzAUzDBQQAFArrnRez7svHk7Pzd7qjgIUC1n56JJs/PzqTJ354dcDVCrJ+FjZ0AEBAJ+2sZHx7P3BoVw4cqXqUwGNUxrz+C9vzaI181OqK35IAFQyNjJm6IAAgImg+8a97Pn+/tw4d6u62wKTzF0yK9u+vCFzlsz68KMAVZ5qABAA8Ak4ve9Cjr55qupTAaX6UtY/tTKrty9Ly/RmAwUEANSCob7hHPjxsZw7eKnqbYOnz56Wh7+4LovXL0ih+E8/J7jaIwwAAgA+IdfO3MqhV07kxtlbVa/x0MaF2fj51Zm18GfvCqiUKxkbHTdoQADARFIpV9L5ztkcfet07t/pq2qNxuaGrHtiZdY+viKNUxp+5q//0WEXAQICACac+3f6c/TNkzn93sWq/1qfs2RmNnx+dRau6fiZfzY+5ggAIABgQrp07GoOv3oiXZfvVvX6QqGQ5Q8vzpbn1n5gr4BKuZLRKq8vABAA8AkbHyvn1LvncuDHxzI0MFzVGlOmNWfV9mVZ+8SKFEvvXxBYqVQ8CAgQADCRdd/ozbG3TuXs/kspl6v7pT1/5dxseW5tZnS0JXl/K+KhvmHDBQQATGSXjl/LnhcOpK97oKrX19WXsmTjwjz6tU0ploqplCsZ7BcAgACACW10eCznDlzKnu8dqPr+/faOtmzcuToL18xLebycof4hgwUEAEx0d6/1ZN9Lh3Ph8JWq15i/cm6e+90nUiwWMnjfEQBAAEBNuHG+Kz/6H29mZKjazYIasnTTwmzdtSH37/YbKCAAoBaMDo3m4tGrees771b1+kKhkBkdbXn8V7amUKnYEAgQAFArerv6svt7B3L19I2qXl+qK2bOkll54tcfTX/voIECAmBSDbNUTNvcaVmwel4WrJ6XmQva0tBcbzA1oDxezu1Ld/KjP30rY1U8za9QKGTKtOZsfmZNmloaDRSY8OqM4MEUioXMWjAjm59bm6WbFmXK9ObUN9QlhWRsdDyD94dy/cytnHj7TC4dv5bhgRFDm6BGhkbTufts3nvpSHZ8Y8tHPwpQKqalbYpBAgLgs655alM2Pb0mW3dtyPyVczNj3rQUS8UUCv9/q9jxsXKWblqU5Vsfysl3zuXg3x/PtdM3DW8iqiT9Pf159c/fzspHlmbG3Gn/7La/AAJgkpo6syWPfm1zHvvmw1m4et4Hful/4K/CumKmz56aaTNbM2the9rmTMueFw7k3IFLhjgBlccrudJ5PW/+5Tv52n94JnWNdf/sewsgACaZ1hlTsvm5ddn5m9szd8msf9FrCsVC2jum5+EvrktdfSkjg6O50nndMCdiBJQr2fP9A1n92LKs2Lbk/VM6AAJgcqtvqMvi9Qvy5K898i/+5f/BeGjJ+qdWZqB3MC/d6El/jyvGJ6J7t+/n9f+1J7MWtmfm/LYUS66X/bk/G411mb9yXnb+5vbPzPdUSSVjw2PZ/b0D3mAEwGTXNm9aNuxclcXr5le9xtSZrVn31MqcPXAxB3583FAnqGNvncqq7Uvz2De3pmV6s4H8HA3NDVmx7aEs3bTwsxMAlaT/3oAAQABMdoVCIfOWzs76J1Y+0HnhQqGQGXOnZ+uujTnyxsmMjYwb7gQ0PlbOm3/1bhatmZ+lmxemvtEtnT/vc12qK6VUV/rsBEC5ktEh7zufTY5rfqS/cOoza1F7Zi+e+cBrNbU0/sOdA20GO4HdutCVPT84kLvX71W9bTCAAKhxLW1TMmPe9I/t1rCGpvp0LJ9tsBPcvheP5My+Cxnqs9EPIAAm5xGApvo0t358T3kr1RUztb3VYCe40aHRvPWdd3O583rGxxwFAATApFOqK6au4eM7v1koFlLf6DKMWnDx2NUceuVE7lztTqVisx9AAEyuvwSHxzLU//E9yrc8Xk5/74DB1ojd39uf0/suuGgTEACTzWDfUPq6P7793sdGxtNzo9dga8RQ3/A/RMB5wwAEwGTS1z2QWxfufCwXg5XHy+nr7s/F49cMtoacP3Q5R944ma4rdw0DEACTRaVcye3Ld3Jm/4UHXqv3Tl+O/eR0RuwOWFPK4+UceuV4jr55KmOjYwYCCIDJ4sb5rhz48fEM9g1VvcbY6Hiun7mVvX970EBrUM+t+zn8WmdO77tgGIAAmCyG+odzet/57P7u/qoeDFMpV3Lt9I289Z29uXutx0BrUKVcyfnDl3P4tc5037xnIIAAmBz/9U/uXr+XPd8/kD3fP/iR7gsvj5dz6cS1vP4X76Rzz7mUx91OVrMh2DecE2+fyZHXOjM+7q4AoPYUfn/dH/otVIW6hrp0LJ+dR7+2OY9+dVPa5k770P//QO9gzuy/mHd/eCidu8+mr/sXe/vf9DlTs2hNx8/9Ov8po0NjOXvgYrqudHvj//FnoL6UuUtnZcnGhQ/8dMjh/pFcPX0z107f/FS/p8YpDVm8fkHmLpnpDc77mwGNjYzlnRdq+3RdQ3N9tn99c3WfzYGRdO45m/t3+n0gBAD/V7FUTNucaVn7uRVZvnVx5q+Yk6ntrWlqbUyxVMzI0Gh67/Tl9sU7uXziWk7vu5DLJ65n2IV/AAiAz8AQi4XMXTIrHcvnZGp7ywcC4P6dvty6dDe3L97JQO+gYQEwIXgO7cegUq7kxrnbuXHutmEAUBNcBAgAAgAAEAAAgAAAAAQAACAAAAABAAAIAABAAAAAAgAAEAAAgAAAAAQAACAAAAABAAAIAABAAAAAAgAABAAAIAAAAAEAAAgAAEAAAAACAAAQAACAAAAABAAAIAAAAAEAAAgAAEAAAAACAAAQAACAAAAABAAACAAAQAAAAAIAABAAAIAAAAAEAAAgAAAAAQAACAAAQAAAAAIAABAAAIAAAAAEAAAgAAAAAQAACAAAEAAAgAAAAAQAACAAAAABAAAIAABAAAAAAgAAEAAAgAAAAAQAACAAAAABAAAIAABAAAAAAgAAEAAAIAAAAAEAAAgAAEAAAAACAAAQAACAAAAABAAAIAAAAAEAAAgAAEAAAAACAAAQAACAAAAABAAAIAAAAAEAAAIAABAAAIAAAAAEAAAgAAAAAQAACAAAQAAAAAIAABAAAIAAAAAEAAAgAAAAAQAACAAAQAAAAAIAAAQAACAAAAABAAAIAABAAAAAAgAAEAAAgAAAAAQAACAAAAABAAAIAABAAAAAAgAAEAAAgAAAAAQAAAgAAEAAAAACAAAQAACAAAAABAAAIAAAAAEAAAgAAEAAAAACAAAQAACAAAAABAAAIAAAAAEAAAgAABAAAIAAAAAEAAAgAAAAAQAACAAAQAAAAAIAABAAAIAAAAAEAAAgAAAAAQAACAAAQAAAAAIAABAAACAAAAABAAAIAABAAAAAAgAAEAAAgAAAAAQAACAAAAABAAAIAABAAAAAAgAAEAAAgAAAAAQAACAAAAABAAACAAAQAACAAAAABAAAIAAAAAEAAAgAAEAAAAACAAAQAACAAAAABAAAIAAAAAEAAAgAAOBn/R+SCzlcnb2onQAAAABJRU5ErkJggg==</iconUrl>
   <templates></templates>
   <decorators></decorators>
diff --git a/Modules/Intent.Modules.EntityFrameworkCore.BasicAuditing/release-notes.md b/Modules/Intent.Modules.EntityFrameworkCore.BasicAuditing/release-notes.md
index 05e35a1f11..dae0ea3605 100644
--- a/Modules/Intent.Modules.EntityFrameworkCore.BasicAuditing/release-notes.md
+++ b/Modules/Intent.Modules.EntityFrameworkCore.BasicAuditing/release-notes.md
@@ -1,7 +1,3 @@
-### Version 1.0.4
-
-- Obsolete: Please install `Intent.Entities.BasicAuditing` as this module is no longer in use. It can be safely removed. 
-
 ### Version 1.0.3
 
 - Fixed: Fails when Entity Interfaces are enabled.
diff --git a/Modules/Intent.Modules.EntityFrameworkCore.BulkOperations/release-notes.md b/Modules/Intent.Modules.EntityFrameworkCore.BulkOperations/release-notes.md
deleted file mode 100644
index b4274ab258..0000000000
--- a/Modules/Intent.Modules.EntityFrameworkCore.BulkOperations/release-notes.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### Version 1.0.0
-
-- New Feature: Initial release.
diff --git a/Modules/Intent.Modules.EntityFrameworkCore.DesignTimeDbContextFactory/release-notes.md b/Modules/Intent.Modules.EntityFrameworkCore.DesignTimeDbContextFactory/release-notes.md
index 6ff1a2d4a2..df65868179 100644
--- a/Modules/Intent.Modules.EntityFrameworkCore.DesignTimeDbContextFactory/release-notes.md
+++ b/Modules/Intent.Modules.EntityFrameworkCore.DesignTimeDbContextFactory/release-notes.md
@@ -1,7 +1,3 @@
-### Version 4.1.0
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 4.0.7
 
 - Improvement: Updated to be compatible with .NET 8.
diff --git a/Modules/Intent.Modules.Eventing.GoogleCloud.PubSub/release-notes.md b/Modules/Intent.Modules.Eventing.GoogleCloud.PubSub/release-notes.md
index 9c506f14a0..bc38649beb 100644
--- a/Modules/Intent.Modules.Eventing.GoogleCloud.PubSub/release-notes.md
+++ b/Modules/Intent.Modules.Eventing.GoogleCloud.PubSub/release-notes.md
@@ -1,7 +1,3 @@
-### Version 1.1.1
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 1.0.6
 
 - Improvement: Updated to be compatible with .NET 8.
diff --git a/Modules/Intent.Modules.Eventing.MassTransit.EntityFrameworkCore/release-notes.md b/Modules/Intent.Modules.Eventing.MassTransit.EntityFrameworkCore/release-notes.md
index 95fed47ce3..c123b9782a 100644
--- a/Modules/Intent.Modules.Eventing.MassTransit.EntityFrameworkCore/release-notes.md
+++ b/Modules/Intent.Modules.Eventing.MassTransit.EntityFrameworkCore/release-notes.md
@@ -1,7 +1,3 @@
-### Version 5.1.0
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 5.0.1
 
 - Logic for saving changes to Entity Framework's unit of work has been moved to version 5.2.4 of the `Intent.Eventing.MassTransit` module which now also handles saving changes for other technologies.
diff --git a/Modules/Intent.Modules.Eventing.MassTransit/Intent.Eventing.MassTransit.imodspec b/Modules/Intent.Modules.Eventing.MassTransit/Intent.Eventing.MassTransit.imodspec
index 013d91d83b..edaafe6115 100644
--- a/Modules/Intent.Modules.Eventing.MassTransit/Intent.Eventing.MassTransit.imodspec
+++ b/Modules/Intent.Modules.Eventing.MassTransit/Intent.Eventing.MassTransit.imodspec
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package>
   <id>Intent.Eventing.MassTransit</id>
-  <version>6.0.2-pre.5</version>
+  <version>6.0.2-pre.4</version>
   <supportedClientVersions>[4.1.0, 5.0.0-a)</supportedClientVersions>
   <summary>MassTransit is a free, open-source distributed application framework for .NET which integrates with the Intent Architect Eventing designer.</summary>
   <description>MassTransit is a free, open-source distributed application framework for .NET which integrates with the Intent Architect Eventing designer.</description>
diff --git a/Modules/Intent.Modules.Eventing.MassTransit/release-notes.md b/Modules/Intent.Modules.Eventing.MassTransit/release-notes.md
index 186b63d97b..2ad243f05e 100644
--- a/Modules/Intent.Modules.Eventing.MassTransit/release-notes.md
+++ b/Modules/Intent.Modules.Eventing.MassTransit/release-notes.md
@@ -2,7 +2,6 @@
 
 - Feature: Support for Sending Commands.
 - Improvement: Added `ArgumentNullException` check on `IUnitOfWork` dependency injection.
-- Improvement: Allow support for Redis OM Unit of Work.
 
 ### Version 6.0.0
 
diff --git a/Modules/Intent.Modules.HotChocolate.GraphQL.Dispatch.MediatR/release-notes.md b/Modules/Intent.Modules.HotChocolate.GraphQL.Dispatch.MediatR/release-notes.md
index 63606dd424..cd11633154 100644
--- a/Modules/Intent.Modules.HotChocolate.GraphQL.Dispatch.MediatR/release-notes.md
+++ b/Modules/Intent.Modules.HotChocolate.GraphQL.Dispatch.MediatR/release-notes.md
@@ -1,7 +1,3 @@
-### Version 1.0.1
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 1.0.0
 
 - Support for dispatching GraphQL queries and mutations to CQRS queries and commands via the MediatR library.
diff --git a/Modules/Intent.Modules.HotChocolate.GraphQL.Dispatch.Services/release-notes.md b/Modules/Intent.Modules.HotChocolate.GraphQL.Dispatch.Services/release-notes.md
index 7c02cb6c2d..86136acf63 100644
--- a/Modules/Intent.Modules.HotChocolate.GraphQL.Dispatch.Services/release-notes.md
+++ b/Modules/Intent.Modules.HotChocolate.GraphQL.Dispatch.Services/release-notes.md
@@ -1,7 +1,3 @@
-### Version 1.0.2
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 1.0.1
 
 - Fix : Collection conversion from `IReadOnlyList<T>` to `List<T>` on service dispatching.
diff --git a/Modules/Intent.Modules.HotChocolate.GraphQL/release-notes.md b/Modules/Intent.Modules.HotChocolate.GraphQL/release-notes.md
index ac11b95626..22f7b8186b 100644
--- a/Modules/Intent.Modules.HotChocolate.GraphQL/release-notes.md
+++ b/Modules/Intent.Modules.HotChocolate.GraphQL/release-notes.md
@@ -1,9 +1,4 @@
-### Version 4.0.3
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
- 
 ### Version 4.0.2
-
 - Update : Added `System.Linq` namespace to `MutationType` and `QueryType` templates.
 
 ### Version 4.0.0
diff --git a/Modules/Intent.Modules.Infrastructure.DependencyInjection/release-notes.md b/Modules/Intent.Modules.Infrastructure.DependencyInjection/release-notes.md
index 387eb1dfad..bc2443b1ec 100644
--- a/Modules/Intent.Modules.Infrastructure.DependencyInjection/release-notes.md
+++ b/Modules/Intent.Modules.Infrastructure.DependencyInjection/release-notes.md
@@ -1,7 +1,3 @@
-### Version 4.1.0
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 4.0.8
 
 - Improvement: Updated to be compatible with .NET 8.
diff --git a/Modules/Intent.Modules.Integration.HttpClients.Shared/NuGetPackages.cs b/Modules/Intent.Modules.Integration.HttpClients.Shared/NuGetPackages.cs
index bceeb22276..808680f565 100644
--- a/Modules/Intent.Modules.Integration.HttpClients.Shared/NuGetPackages.cs
+++ b/Modules/Intent.Modules.Integration.HttpClients.Shared/NuGetPackages.cs
@@ -1,10 +1,22 @@
+using Intent.Engine;
+using Intent.Modules.Common.CSharp.VisualStudio;
 using Intent.Modules.Common.VisualStudio;
 
 namespace Intent.Modules.Integration.HttpClients.Shared;
 
 public static class NuGetPackages
 {
-    public static readonly INugetPackageInfo MicrosoftExtensionsHttp = new NugetPackageInfo("Microsoft.Extensions.Http", "6.0.0");
+
+    public static INugetPackageInfo MicrosoftExtensionsHttp(IOutputTarget outputTarget) => new NugetPackageInfo(
+        name: "Microsoft.Extensions.Http",
+        version: outputTarget.GetMaxNetAppVersion() switch
+        {
+            (5, 0) => "5.0.0",
+            (6, 0) => "6.0.0",
+            (7, 0) => "7.0.0",
+            _ => "8.0.0"
+        });
+
     public static readonly INugetPackageInfo MicrosoftAspNetCoreWebUtilities = new NugetPackageInfo("Microsoft.AspNetCore.WebUtilities", "2.2.0");
     public static readonly INugetPackageInfo IdentityModelAspNetCore = new NugetPackageInfo("IdentityModel.AspNetCore", "4.3.0");
 }
\ No newline at end of file
diff --git a/Modules/Intent.Modules.Integration.HttpClients.Shared/Templates/Adapters/CQRSModelAdapter.cs b/Modules/Intent.Modules.Integration.HttpClients.Shared/Templates/Adapters/CQRSModelAdapter.cs
index 2e1f7d3933..f437ca3a3c 100644
--- a/Modules/Intent.Modules.Integration.HttpClients.Shared/Templates/Adapters/CQRSModelAdapter.cs
+++ b/Modules/Intent.Modules.Integration.HttpClients.Shared/Templates/Adapters/CQRSModelAdapter.cs
@@ -1,5 +1,4 @@
 using Intent.Metadata.Models;
-using Intent.Modules.Common.Types.Api;
 using Intent.Modules.Metadata.WebApi.Models;
 using Intent.RoslynWeaver.Attributes;
 using System;
@@ -15,7 +14,6 @@ internal class CQRSModelAdapter : IServiceProxyModel
         public CQRSModelAdapter(IElement folder)
         {
             _folder = folder;
-            Folder = folder.AsFolderModel();
         }
 
         public string Name => _folder.Name;
@@ -23,8 +21,6 @@ public CQRSModelAdapter(IElement folder)
 
         public IMetadataModel UnderlyingModel => null;
 
-        public FolderModel Folder { get; }
-
         public IEnumerable<IHttpEndpointModel> GetMappedEndpoints()
         {
             return _folder.ChildElements
diff --git a/Modules/Intent.Modules.Integration.HttpClients.Shared/Templates/Adapters/ServiceModelAdapter.cs b/Modules/Intent.Modules.Integration.HttpClients.Shared/Templates/Adapters/ServiceModelAdapter.cs
index 359f03bed9..a98869aee6 100644
--- a/Modules/Intent.Modules.Integration.HttpClients.Shared/Templates/Adapters/ServiceModelAdapter.cs
+++ b/Modules/Intent.Modules.Integration.HttpClients.Shared/Templates/Adapters/ServiceModelAdapter.cs
@@ -1,12 +1,10 @@
 using Intent.Metadata.Models;
 using Intent.Modelers.Services.Api;
-using Intent.Modules.Common.Types.Api;
 using Intent.Modules.Metadata.WebApi.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Xml.Linq;
 
 namespace Intent.Modules.Integration.HttpClients.Shared.Templates.Adapters
 {
@@ -16,15 +14,14 @@ internal class ServiceModelAdapter : IServiceProxyModel
         public ServiceModelAdapter(ServiceModel model)
         {
             _model = model;
-            Folder = ((model.InternalElement.ParentElement?.SpecializationTypeId == "4d95d53a-8855-4f35-aa82-e312643f5c5f") ? new FolderModel(model.InternalElement.ParentElement) : null);
         }
+
         public string Name => _model.Name;
+
         public string Id => _model.Id;
 
         public IMetadataModel UnderlyingModel => _model;
 
-        public FolderModel Folder { get; }
-
         public IEnumerable<IHttpEndpointModel> GetMappedEndpoints()
         {
             return _model.Operations
diff --git a/Modules/Intent.Modules.Integration.HttpClients.Shared/Templates/Adapters/ServiceProxyModelAdapter.cs b/Modules/Intent.Modules.Integration.HttpClients.Shared/Templates/Adapters/ServiceProxyModelAdapter.cs
index 75237d43f7..3d6cf47390 100644
--- a/Modules/Intent.Modules.Integration.HttpClients.Shared/Templates/Adapters/ServiceProxyModelAdapter.cs
+++ b/Modules/Intent.Modules.Integration.HttpClients.Shared/Templates/Adapters/ServiceProxyModelAdapter.cs
@@ -7,7 +7,6 @@
 using System.Linq;
 using System.Collections.Generic;
 using System.Text;
-using Intent.Modules.Common.Types.Api;
 
 namespace Intent.Modules.Integration.HttpClients.Shared.Templates.Adapters
 {
@@ -25,8 +24,6 @@ public ServiceProxyModelAdapter(ServiceProxyModel model)
 
         public IMetadataModel UnderlyingModel => _model;
 
-        public FolderModel Folder => _model.Folder;
-
         public IEnumerable<IHttpEndpointModel> GetMappedEndpoints()
         {
             return ServiceProxyHelpers.GetMappedEndpoints(_model);
diff --git a/Modules/Intent.Modules.Integration.HttpClients.Shared/Templates/HttpClient/HttpClientTemplateBase.cs b/Modules/Intent.Modules.Integration.HttpClients.Shared/Templates/HttpClient/HttpClientTemplateBase.cs
index 5de8310101..f7aeb29326 100644
--- a/Modules/Intent.Modules.Integration.HttpClients.Shared/Templates/HttpClient/HttpClientTemplateBase.cs
+++ b/Modules/Intent.Modules.Integration.HttpClients.Shared/Templates/HttpClient/HttpClientTemplateBase.cs
@@ -61,7 +61,7 @@ protected HttpClientTemplateBase(
 
         var endpoints = Model.GetMappedEndpoints().ToArray();
 
-        AddNugetDependency(NuGetPackages.MicrosoftExtensionsHttp);
+        AddNugetDependency(NuGetPackages.MicrosoftExtensionsHttp(outputTarget));
         AddNugetDependency(NuGetPackages.MicrosoftAspNetCoreWebUtilities);
 
         SetDefaultCollectionFormatter(CSharpCollectionFormatter.CreateList());
diff --git a/Modules/Intent.Modules.Integration.HttpClients.Shared/Templates/IServiceProxyModel.cs b/Modules/Intent.Modules.Integration.HttpClients.Shared/Templates/IServiceProxyModel.cs
index 5b292abaa7..e0f5542313 100644
--- a/Modules/Intent.Modules.Integration.HttpClients.Shared/Templates/IServiceProxyModel.cs
+++ b/Modules/Intent.Modules.Integration.HttpClients.Shared/Templates/IServiceProxyModel.cs
@@ -1,5 +1,4 @@
 using Intent.Metadata.Models;
-using Intent.Modules.Common.Types.Api;
 using Intent.Modules.Metadata.WebApi.Models;
 using System;
 using System.Collections.Generic;
@@ -7,7 +6,7 @@
 
 namespace Intent.Modules.Integration.HttpClients.Shared.Templates
 {
-    public interface IServiceProxyModel : IMetadataModel, IHasFolder 
+    public interface IServiceProxyModel : IMetadataModel
     {
         string Name { get; }
         IEnumerable<IHttpEndpointModel> GetMappedEndpoints();
diff --git a/Modules/Intent.Modules.Integration.HttpClients/Intent.Integration.HttpClients.imodspec b/Modules/Intent.Modules.Integration.HttpClients/Intent.Integration.HttpClients.imodspec
index a8f486872d..369d270171 100644
--- a/Modules/Intent.Modules.Integration.HttpClients/Intent.Integration.HttpClients.imodspec
+++ b/Modules/Intent.Modules.Integration.HttpClients/Intent.Integration.HttpClients.imodspec
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package>
   <id>Intent.Integration.HttpClients</id>
-  <version>5.1.0-pre.1</version>
+  <version>5.1.0-pre.2</version>
   <supportedClientVersions>[4.0.0-beta.4, 5.0.0-a)</supportedClientVersions>
   <summary>Introduces a Http Client implementation that can make service calls against a referenced service Restful API.</summary>
   <description>Introduces a Http Client implementation that can make service calls against a referenced service Restful API.</description>
diff --git a/Modules/Intent.Modules.Integration.HttpClients/release-notes.md b/Modules/Intent.Modules.Integration.HttpClients/release-notes.md
index 3905c96d02..0996936bb6 100644
--- a/Modules/Intent.Modules.Integration.HttpClients/release-notes.md
+++ b/Modules/Intent.Modules.Integration.HttpClients/release-notes.md
@@ -1,6 +1,6 @@
 ### Version 5.1.0
 
-- Improvement: Upgraded module to support new 4.1 SDK features.
+- Improvement: Upgraded Microsoft.Extensions.Http NuGet package to version 8.0.0
 
 ### Version 5.0.8
 
diff --git a/Modules/Intent.Modules.IntegrationTesting/Intent.AspNetCore.IntegrationTesting.imodspec b/Modules/Intent.Modules.IntegrationTesting/Intent.AspNetCore.IntegrationTesting.imodspec
new file mode 100644
index 0000000000..e7502f479f
--- /dev/null
+++ b/Modules/Intent.Modules.IntegrationTesting/Intent.AspNetCore.IntegrationTesting.imodspec
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <id>Intent.AspNetCore.IntegrationTesting</id>
+  <version>1.0.0-pre.0</version>
+  <supportedClientVersions>[4.1.0-beta.21,5.0.0)</supportedClientVersions>
+  <summary>The module adds support for Integration Testing Asp.Net Core applications.</summary>
+  <description>The module adds support for Integration Testing Asp.Net Core applications.</description>
+  <authors>Intent Architect</authors>
+  <tags>csharp dotnet integration testing asp.net xunit</tags>
+  <projectUrl>https://github.com/IntentArchitect/Intent.Modules.NET/blob/development/Modules/Intent.Modules.IntegrationTesting/README.md</projectUrl>
+  <releaseNotes>release-notes.md</releaseNotes>
+  <iconUrl>data:image/png;base64,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</iconUrl>
+  <templates>
+    <template id="Intent.AspNetCore.IntegrationTesting.BaseIntegrationTest" externalReference="11bb9e08-4faa-491d-9968-90aa2e38bee4">
+      <config>
+        <add key="ClassName" description="Class name formula override (e.g. '${Model.Name}')" />
+        <add key="Namespace" description="Class namespace formula override (e.g. '${Project.Name}'" />
+      </config>
+      <role>IntegrationTests</role>
+      <location></location>
+    </template>
+    <template id="Intent.AspNetCore.IntegrationTesting.CosmosContainerFixture" externalReference="0b99c31a-6949-440c-8cf7-174149011e11">
+      <config>
+        <add key="ClassName" description="Class name formula override (e.g. '${Model.Name}')" />
+        <add key="Namespace" description="Class namespace formula override (e.g. '${Project.Name}'" />
+      </config>
+      <role>IntegrationTests</role>
+      <location></location>
+    </template>
+    <template id="Intent.AspNetCore.IntegrationTesting.DtoContract" externalReference="54832b8a-b8c8-415b-912e-8d6d37874ce4">
+      <config>
+        <add key="ClassName" description="Class name formula override (e.g. '${Model.Name}')" />
+        <add key="Namespace" description="Class namespace formula override (e.g. '${Project.Name}'" />
+      </config>
+      <role>IntegrationTests.Dto</role>
+      <location></location>
+    </template>
+    <template id="Intent.AspNetCore.IntegrationTesting.EFContainerFixture" externalReference="6912e8b6-2499-4dd6-9796-2c6cb15d3445">
+      <config>
+        <add key="ClassName" description="Class name formula override (e.g. '${Model.Name}')" />
+        <add key="Namespace" description="Class namespace formula override (e.g. '${Project.Name}'" />
+      </config>
+      <role>IntegrationTests</role>
+      <location></location>
+    </template>
+    <template id="Intent.AspNetCore.IntegrationTesting.EnumContract" externalReference="0c17e058-e10e-4916-9120-71fb34c4e19c">
+      <config>
+        <add key="ClassName" description="Class name formula override (e.g. '${Model.Name}')" />
+        <add key="Namespace" description="Class namespace formula override (e.g. '${Project.Name}'" />
+      </config>
+      <role>IntegrationTests.Enum</role>
+      <location></location>
+    </template>
+    <template id="Intent.AspNetCore.IntegrationTesting.HttpClient" externalReference="50c75db6-a519-4595-8a49-423205c79ab9">
+      <config>
+        <add key="ClassName" description="Class name formula override (e.g. '${Model.Name}')" />
+        <add key="Namespace" description="Class namespace formula override (e.g. '${Project.Name}'" />
+      </config>
+      <role>IntegrationTests.HttpClients</role>
+      <location></location>
+    </template>
+    <template id="Intent.AspNetCore.IntegrationTesting.HttpClientRequestException" externalReference="a4302909-1646-4550-96ae-ae2028a5b82b">
+      <config>
+        <add key="ClassName" description="Class name formula override (e.g. '${Model.Name}')" />
+        <add key="Namespace" description="Class namespace formula override (e.g. '${Project.Name}'" />
+      </config>
+      <role>IntegrationTests.HttpClients</role>
+      <location></location>
+    </template>
+    <template id="Intent.AspNetCore.IntegrationTesting.IntegrationTestWebAppFactory" externalReference="a6ab8bff-6ffb-4e2b-858d-55e7ab920611">
+      <config>
+        <add key="ClassName" description="Class name formula override (e.g. '${Model.Name}')" />
+        <add key="Namespace" description="Class namespace formula override (e.g. '${Project.Name}'" />
+      </config>
+      <role>IntegrationTests</role>
+      <location></location>
+    </template>
+    <template id="Intent.AspNetCore.IntegrationTesting.JsonResponse" externalReference="b6cd8740-54cb-4d7f-a99a-0d31c33cccaa">
+      <config>
+        <add key="ClassName" description="Class name formula override (e.g. '${Model.Name}')" />
+        <add key="Namespace" description="Class namespace formula override (e.g. '${Project.Name}'" />
+      </config>
+      <role>IntegrationTests.HttpClients</role>
+      <location></location>
+    </template>
+    <template id="Intent.AspNetCore.IntegrationTesting.PagedResult" externalReference="d4aff178-7a0d-417c-99fc-315657b140f5">
+      <config>
+        <add key="ClassName" description="Class name formula override (e.g. '${Model.Name}')" />
+        <add key="Namespace" description="Class namespace formula override (e.g. '${Project.Name}'" />
+      </config>
+      <role>IntegrationTests.PagedResult</role>
+      <location></location>
+    </template>
+    <template id="Intent.AspNetCore.IntegrationTesting.ProxyServiceContract" externalReference="7d445f76-f30e-4651-8d9b-df3a51c23390">
+      <config>
+        <add key="ClassName" description="Class name formula override (e.g. '${Model.Name}')" />
+        <add key="Namespace" description="Class namespace formula override (e.g. '${Project.Name}'" />
+      </config>
+      <role>IntegrationTests.HttpClients</role>
+      <location></location>
+    </template>
+    <template id="Intent.AspNetCore.IntegrationTesting.ServiceEndpointTest" externalReference="e0586df8-b1e3-4f5d-b2f1-3632fdd9fcd3">
+      <config>
+        <add key="ClassName" description="Class name formula override (e.g. '${Model.Name}')" />
+        <add key="Namespace" description="Class namespace formula override (e.g. '${Project.Name}'" />
+      </config>
+      <role>IntegrationTests.Tests</role>
+      <location></location>
+    </template>
+    <template id="Intent.AspNetCore.IntegrationTesting.SharedContainerFixture" externalReference="5c0dd717-a98d-49c4-8051-a73277edf999">
+      <config>
+        <add key="ClassName" description="Class name formula override (e.g. '${Model.Name}')" />
+        <add key="Namespace" description="Class namespace formula override (e.g. '${Project.Name}'" />
+      </config>
+      <role>IntegrationTests</role>
+      <location></location>
+    </template>
+    <template id="Intent.Modules.IntegrationTesting.Templates.StaticContentTemplateRegistrations.StaticFilesStaticContentTemplateRegistration" externalReference="e52a995f-2a26-431a-902a-de6d29e8c071">
+      <role>IntegrationTests</role>
+      <location></location>
+    </template>
+  </templates>
+  <decorators></decorators>
+  <factoryExtensions></factoryExtensions>
+  <moduleSettings>
+    <group id="d37f669a-8f2c-49ed-8c28-6ad31d836754" title="Integration Test Settings" externalReference="d37f669a-8f2c-49ed-8c28-6ad31d836754">
+      <settings>
+        <setting id="e3ac09d9-db67-4432-8c77-44d38fe228a9" title="Container Isolation" type="select">
+          <isRequired>false</isRequired>
+          <defaultValue>shared-container</defaultValue>
+          <options>
+            <option value="container-per-test-class" description="Container per Test Class" />
+            <option value="shared-container" description="Shared Container" />
+          </options>
+        </setting>
+      </settings>
+    </group>
+  </moduleSettings>
+  <dependencies>
+    <dependency id="Intent.Common" version="3.5.0" />
+    <dependency id="Intent.Common.CSharp" version="3.4.1" />
+    <dependency id="Intent.Common.Types" version="3.3.9" />
+    <dependency id="Intent.Metadata.WebApi" version="4.4.1" />
+    <dependency id="Intent.Modelers.Services" version="3.5.1" />
+    <dependency id="Intent.Modelers.Types.ServiceProxies" version="5.2.0" />
+    <dependency id="Intent.OutputManager.RoslynWeaver" version="4.3.1" />
+  </dependencies>
+  <files>
+    <file src="$outDir$/$id$.dll" />
+    <file src="$outDir$/$id$.pdb" />
+  </files>
+  <tags />
+  <moduleSettingsExtensions />
+  <metadata />
+</package>
\ No newline at end of file
diff --git a/Modules/Intent.Modules.IntegrationTesting/Intent.Modules.IntegrationTesting.csproj b/Modules/Intent.Modules.IntegrationTesting/Intent.Modules.IntegrationTesting.csproj
new file mode 100644
index 0000000000..017d49db0f
--- /dev/null
+++ b/Modules/Intent.Modules.IntegrationTesting/Intent.Modules.IntegrationTesting.csproj
@@ -0,0 +1,38 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="resources\static-content\GlobalUsings.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="resources\static-content\GlobalUsings.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Intent.Modules.Common" Version="3.5.0" />
+    <PackageReference Include="Intent.Modules.Common.CSharp" Version="3.4.1" />
+    <PackageReference Include="Intent.Modules.Metadata.RDBMS" Version="3.5.9" />
+    <PackageReference Include="Intent.Modules.Metadata.WebApi" Version="4.3.2" />
+    <PackageReference Include="Intent.Modules.Modelers.Services" Version="3.5.1" />
+    <PackageReference Include="Intent.Modules.Modelers.Types.ServiceProxies" Version="5.0.1" />
+    <PackageReference Include="Intent.Packager" Version="3.4.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Intent.RoslynWeaver.Attributes" Version="2.1.3" />
+    <PackageReference Include="Intent.SoftwareFactory.SDK" Version="3.5.0-pre.6" />
+  </ItemGroup>
+    
+  <ItemGroup>
+    <ProjectReference Include="..\Intent.Modules.Constants\Intent.Modules.Constants.csproj" PrivateAssets="All" />
+  </ItemGroup>
+
+  <Import Project="..\Intent.Modules.Integration.HttpClients.Shared\Intent.Modules.Integration.HttpClients.Shared.projitems" Label="Shared" />
+  <Import Project="..\Intent.Modules.Contracts.Clients.Shared\Intent.Modules.Contracts.Clients.Shared.projitems" Label="Shared" />
+  <Import Project="..\Intent.Modules.Enums.Shared\Intent.Modules.Enums.Shared.projitems" Label="Shared" />
+
+</Project>
\ No newline at end of file
diff --git a/Modules/Intent.Modules.IntegrationTesting/Templates/CosmosContainerFixture/CosmosContainerFixtureTemplatePartial.cs b/Modules/Intent.Modules.IntegrationTesting/Templates/CosmosContainerFixture/CosmosContainerFixtureTemplatePartial.cs
new file mode 100644
index 0000000000..9e79f9cc94
--- /dev/null
+++ b/Modules/Intent.Modules.IntegrationTesting/Templates/CosmosContainerFixture/CosmosContainerFixtureTemplatePartial.cs
@@ -0,0 +1,208 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Reflection.Metadata.Ecma335;
+using Intent.Engine;
+using Intent.Modules.Common;
+using Intent.Modules.Common.CSharp.Builder;
+using Intent.Modules.Common.CSharp.Templates;
+using Intent.Modules.Common.Templates;
+using Intent.Modules.Metadata.RDBMS.Settings;
+using Intent.RoslynWeaver.Attributes;
+using Intent.Templates;
+
+[assembly: DefaultIntentManaged(Mode.Fully)]
+[assembly: IntentTemplate("Intent.ModuleBuilder.CSharp.Templates.CSharpTemplatePartial", Version = "1.0")]
+
+namespace Intent.Modules.AspNetCore.IntegrationTesting.Templates.CosmosContainerFixture
+{
+    [IntentManaged(Mode.Fully, Body = Mode.Merge)]
+    public partial class CosmosContainerFixtureTemplate : CSharpTemplateBase<object>, ICSharpFileBuilderTemplate
+    {
+        public const string TemplateId = "Intent.AspNetCore.IntegrationTesting.CosmosContainerFixture";
+
+        [IntentManaged(Mode.Fully, Body = Mode.Ignore)]
+        public CosmosContainerFixtureTemplate(IOutputTarget outputTarget, object model = null) : base(TemplateId, outputTarget, model)
+        {
+            CSharpFile = new CSharpFile(this.GetNamespace(), this.GetFolderPath())
+                .AddClass($"CosmosContainerFixture", @class =>
+                {
+                    AddUsing("System.Reflection");
+                    AddUsing("DotNet.Testcontainers.Builders");
+                    AddUsing("DotNet.Testcontainers.Configurations");
+                    AddUsing("Microsoft.Azure.Cosmos");
+                    AddUsing("Microsoft.Azure.Cosmos.Fluent");
+                    AddUsing("Microsoft.Azure.CosmosRepository.Options");
+                    AddUsing("Microsoft.Extensions.DependencyInjection");
+                    AddUsing("Microsoft.Extensions.Options");
+                    AddUsing("Testcontainers.CosmosDb");
+                    AddNugetDependency(NugetPackages.TestcontainersCosmosDb);
+                    @class.AddField("string", "_accountEndpoint", f => f.PrivateReadOnly().WithAssignment("\"https://localhost:{0}/\""));
+                    @class.AddField("string", "_accountKey", f => f.PrivateReadOnly().WithAssignment("\"C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==\""));
+                    @class.AddField("CosmosDbContainer", "_dbContainer", f => f.PrivateReadOnly());
+                    @class.AddField("int", "_portNumber", f => f.Private().WithAssignment("0"));
+                    @class.AddField("CosmosClient?", "_cosmosClient", f => f.Private());
+                    @class.AddField("Type?", "_cosmosProviderType", f => f.Private());
+
+                    @class.AddConstructor(ctor =>
+                    {
+                        ctor.AddStatements(@"_dbContainer = new CosmosDbBuilder()
+              .WithImage(""mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator"")
+              .WithName(""azure-cosmos-emulator"")
+              .WithExposedPort(8081)
+                .WithExposedPort(10251)
+                .WithExposedPort(10252)
+                .WithExposedPort(10253)
+                .WithExposedPort(10254)
+              .WithPortBinding(8081, true)
+              .WithPortBinding(10251, true)
+              .WithPortBinding(10252, true)
+              .WithPortBinding(10253, true)
+              .WithPortBinding(10254, true)
+              .WithEnvironment(""AZURE_COSMOS_EMULATOR_PARTITION_COUNT"", ""1"")
+              .WithEnvironment(""AZURE_COSMOS_EMULATOR_IP_ADDRESS_OVERRIDE"", ""127.0.0.1"")
+              .WithEnvironment(""AZURE_COSMOS_EMULATOR_ENABLE_DATA_PERSISTENCE"", ""false"")
+              .WithWaitStrategy(Wait.ForUnixContainer()
+                .UntilPortIsAvailable(8081))
+              .Build();".ConvertToStatements());
+                    });
+
+#warning get these
+                    string databaseId = "CosmosIntegrationTest";
+                    string containerId = "Container";
+
+                    @class.AddMethod("void", "ConfigureTestServices", method =>
+                    {
+                        method.AddParameter("IServiceCollection", "services");
+                        method.AddStatements(@$"var updatedEndpoint = string.Format(_accountEndpoint, _portNumber);
+
+            var descriptor = services.SingleOrDefault(s => s.ServiceType == typeof(IOptions<RepositoryOptions>));
+            if (descriptor is not null)
+            {{
+                services.Remove(descriptor);
+            }}
+
+            services.AddSingleton<IOptions<RepositoryOptions>>(new OptionsMock(new RepositoryOptions() {{ CosmosConnectionString = $""AccountEndpoint={{updatedEndpoint}};AccountKey={{_accountKey}}"", DatabaseId = ""{databaseId}"", ContainerId = ""{containerId}"" }}));
+
+            var cosmosClientBuilder = new CosmosClientBuilder(updatedEndpoint, _accountKey);
+            cosmosClientBuilder.WithHttpClientFactory(() =>
+            {{
+                HttpMessageHandler httpMessageHandler = new HttpClientHandler
+                {{
+                    ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator
+                }};
+
+                return new HttpClient(new FixRequestLocationHandler(_portNumber, httpMessageHandler));
+            }});
+            cosmosClientBuilder.WithConnectionModeGateway();
+            cosmosClientBuilder.WithSerializerOptions(new CosmosSerializationOptions
+            {{
+                IgnoreNullValues = false,
+                Indented = false,
+                PropertyNamingPolicy = CosmosPropertyNamingPolicy.CamelCase
+            }});
+
+            _cosmosClient = cosmosClientBuilder.Build();
+            _cosmosProviderType = services.Single(s => s.ServiceType.Name == ""ICosmosClientProvider"").ServiceType;
+".ConvertToStatements());
+
+                        @class.AddMethod("void", "OnHostCreation", method =>
+                        {
+                            method
+                                .AddParameter("IServiceProvider", "services")
+                                .AddStatement("SwapCosmosClientToTestVersion(services);");
+                        });
+
+                        @class.AddMethod("void", "SwapCosmosClientToTestVersion", method =>
+                        {
+                            method
+                                .Private()
+                                .AddParameter("IServiceProvider", "services")
+                                .AddStatement("var cosmosClientProvider = services.GetRequiredService(_cosmosProviderType!);")
+                                .AddStatement("var privateField = cosmosClientProvider.GetType().GetField(\"_lazyCosmosClient\", BindingFlags.NonPublic | BindingFlags.Instance);")
+                                .AddStatement("if (privateField is null) throw new Exception(\"Unable to inject testing CosmosClient. Can't find _lazyCosmosClient\");")
+                                .AddStatement("privateField.SetValue(cosmosClientProvider, new Lazy<CosmosClient>(_cosmosClient!));");
+                        });
+
+                        @class.AddMethod("void", "InitializeAsync", method =>
+                        {
+                            method
+                                .Async()
+                                .AddStatement(@"await _dbContainer.StartAsync();")
+                                .AddStatement(@"_portNumber = _dbContainer.GetMappedPublicPort(8081);");
+                        });
+
+                        @class.AddMethod("Task", "DisposeAsync", method =>
+                        {
+                            method
+                                .Async()
+                                .AddStatement("await _dbContainer.StopAsync();");
+                        });
+                    });
+                })
+                .AddClass("OptionsMock", options =>
+                {
+                    options.ImplementsInterface("IOptions<RepositoryOptions>");
+                    options.AddConstructor(ctor =>
+                    {
+                        ctor.AddParameter("RepositoryOptions", "options", p => p.IntroduceReadonlyField());
+                    });
+                    options.AddProperty("RepositoryOptions", "Value", p => p.WithoutSetter().Getter.WithExpressionImplementation("_options"));
+                })
+                .AddClass("FixRequestLocationHandler", fix =>
+                {
+                    fix.WithBaseType("DelegatingHandler");
+                    fix.AddConstructor(ctor =>
+                    {
+                        ctor.AddParameter("int", "portNumber", p => p.IntroduceReadonlyField());
+                        ctor.AddParameter("HttpMessageHandler", "innerHandler");
+                        ctor.CallsBase(c => c.AddArgument("innerHandler"));
+                    });
+
+                    fix.AddMethod("Task<HttpResponseMessage>", "SendAsync", method =>
+                    {
+
+                        method
+                            .Async()
+                            .Protected()
+                            .Override()
+                            .AddParameter("HttpRequestMessage", "request")
+                            .AddParameter("CancellationToken", "cancellationToken")
+                            .AddStatement("request.RequestUri = new Uri($\"https://localhost:{_portNumber}{request.RequestUri.PathAndQuery}\");")
+                            .AddStatement("HttpResponseMessage response = await base.SendAsync(request, cancellationToken);")
+                            .AddStatement("return response;");
+                        method.WithComments(@"
+/// <summary>
+/// Override of the SendAsync method to allow for reconstruction of the request uri to point to the dynamic testcontainer
+/// port number. This needs to be done as otherwise it defaults back to 8081. I assume there is some hard coded port in
+/// the emulator somewhere. If this is not done then the requests are not successful.
+/// </summary>
+/// <param name=""request""></param>
+/// <param name=""cancellationToken""></param>
+/// <returns></returns>");
+                    });
+                });
+        }
+
+        public override bool CanRunTemplate()
+        {
+            return base.CanRunTemplate() && ContainerHelper.RequireCosmosContainer(this);
+        }
+
+        [IntentManaged(Mode.Fully)]
+        public CSharpFile CSharpFile { get; }
+
+        [IntentManaged(Mode.Fully)]
+        protected override CSharpFileConfig DefineFileConfig()
+        {
+            return CSharpFile.GetConfig();
+        }
+
+        [IntentManaged(Mode.Fully)]
+        public override string TransformText()
+        {
+            return CSharpFile.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Modules/Intent.Modules.IntegrationTesting/Templates/DtoContract/DtoContractTemplatePartial.cs b/Modules/Intent.Modules.IntegrationTesting/Templates/DtoContract/DtoContractTemplatePartial.cs
new file mode 100644
index 0000000000..0948c9052a
--- /dev/null
+++ b/Modules/Intent.Modules.IntegrationTesting/Templates/DtoContract/DtoContractTemplatePartial.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using Intent.Engine;
+using Intent.Modelers.Services.Api;
+using Intent.Modules.Common;
+using Intent.Modules.Common.CSharp.Builder;
+using Intent.Modules.Common.CSharp.Templates;
+using Intent.Modules.Common.Templates;
+using Intent.Modules.Contracts.Clients.Shared.Templates.DtoContract;
+using Intent.Modules.AspNetCore.IntegrationTesting.Templates.EnumContract;
+using Intent.Modules.AspNetCore.IntegrationTesting.Templates.PagedResult;
+using Intent.RoslynWeaver.Attributes;
+using Intent.Templates;
+
+[assembly: DefaultIntentManaged(Mode.Fully)]
+[assembly: IntentTemplate("Intent.ModuleBuilder.CSharp.Templates.CSharpTemplatePartial", Version = "1.0")]
+
+namespace Intent.Modules.AspNetCore.IntegrationTesting.Templates.DtoContract
+{
+    [IntentManaged(Mode.Ignore)]
+    public partial class DtoContractTemplate : DtoContractTemplateBase
+    {
+        public const string TemplateId = "Intent.AspNetCore.IntegrationTesting.DtoContract";
+
+        public DtoContractTemplate(IOutputTarget outputTarget, DTOModel model)
+            : base(
+        templateId: TemplateId,
+        outputTarget: outputTarget,
+        model: model,
+        enumContractTemplateId: EnumContractTemplate.TemplateId,
+        pagedResultTemplateId: PagedResultTemplate.TemplateId)
+        {
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/Modules/Intent.Modules.IntegrationTesting/Templates/EFContainerFixture/EFContainerFixtureTemplatePartial.cs b/Modules/Intent.Modules.IntegrationTesting/Templates/EFContainerFixture/EFContainerFixtureTemplatePartial.cs
new file mode 100644
index 0000000000..91b9e2c819
--- /dev/null
+++ b/Modules/Intent.Modules.IntegrationTesting/Templates/EFContainerFixture/EFContainerFixtureTemplatePartial.cs
@@ -0,0 +1,175 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Intent.Engine;
+using Intent.Modules.Common;
+using Intent.Modules.Common.CSharp.Builder;
+using Intent.Modules.Common.CSharp.Templates;
+using Intent.Modules.Common.Templates;
+using Intent.Modules.Constants;
+using Intent.Modules.Metadata.RDBMS.Settings;
+using Intent.RoslynWeaver.Attributes;
+using Intent.Templates;
+
+[assembly: DefaultIntentManaged(Mode.Fully)]
+[assembly: IntentTemplate("Intent.ModuleBuilder.CSharp.Templates.CSharpTemplatePartial", Version = "1.0")]
+
+namespace Intent.Modules.AspNetCore.IntegrationTesting.Templates.EFContainerFixture
+{
+    [IntentManaged(Mode.Fully, Body = Mode.Merge)]
+    public partial class EFContainerFixtureTemplate : CSharpTemplateBase<object>, ICSharpFileBuilderTemplate
+    {
+        public const string TemplateId = "Intent.AspNetCore.IntegrationTesting.EFContainerFixture";
+
+        [IntentManaged(Mode.Fully, Body = Mode.Ignore)]
+        public EFContainerFixtureTemplate(IOutputTarget outputTarget, object model = null) : base(TemplateId, outputTarget, model)
+        {
+            CSharpFile = new CSharpFile(this.GetNamespace(), this.GetFolderPath())
+                .AddClass($"RBBMSFixture", @class =>
+                {
+                    var dbStrategy = ExecutionContext.Settings.GetDatabaseSettings().DatabaseProvider().AsEnum() switch
+                    {
+                        DatabaseSettingsExtensions.DatabaseProviderOptionsEnum.SqlServer => GetSqlServerStrategy(),
+                        DatabaseSettingsExtensions.DatabaseProviderOptionsEnum.Postgresql => GetPostgresStrategy(),
+                        _ => throw new Exception($"Integration Testings patterns do not currently support : {ExecutionContext.Settings.GetDatabaseSettings().DatabaseProvider().Value}"),
+                    };
+                    AddUsing("System.Reflection");
+                    AddUsing("DotNet.Testcontainers.Builders");
+                    AddUsing("DotNet.Testcontainers.Configurations");
+                    AddUsing("Microsoft.Extensions.DependencyInjection");
+                    AddUsing("Microsoft.Extensions.Options");
+                    foreach (var clause in dbStrategy.Usings)
+                    {
+                        AddUsing(clause);
+                    }
+                    foreach (var nuGet in dbStrategy.NuGetPackages)
+                    {
+                        AddNugetDependency(nuGet);
+                    }
+                    @class.AddField(dbStrategy.ContainerType, "_dbContainer", f => f.PrivateReadOnly());
+
+                    @class.AddConstructor(ctor =>
+                    {
+                        ctor.AddStatements(dbStrategy.ContainerInitialization);
+                    });
+
+                    @class.AddMethod("void", "ConfigureTestServices", method =>
+                    {
+                        method.AddParameter("IServiceCollection", "services");
+                        method.AddStatements(@$"var descriptor = services.SingleOrDefault(s => s.ServiceType  == typeof( DbContextOptions<{GetTypeName(TemplateRoles.Infrastructure.Data.DbContext)}>));
+                if (descriptor is not null)
+                {{
+                    services.Remove(descriptor);
+                }}
+".ConvertToStatements());
+                        method.AddStatements(dbStrategy.DbContextRegistration);
+
+                        method.AddStatements(@"
+                //Schema Creation
+                var serviceProvider = services.BuildServiceProvider();
+                using var scope = serviceProvider.CreateScope();
+                var scopedServices = scope.ServiceProvider;
+                var context = scopedServices.GetRequiredService<ApplicationDbContext>();
+                context.Database.EnsureCreated();
+
+".ConvertToStatements());
+
+                        @class.AddMethod("void", "OnHostCreation", method =>
+                        {
+                            method
+                                .AddParameter("IServiceProvider", "services");
+                        });
+
+                        @class.AddMethod("void", "InitializeAsync", method =>
+                        {
+                            method
+                                .Async()
+                                .AddStatement("await _dbContainer.StartAsync();");
+                        });
+
+                        @class.AddMethod("Task", "DisposeAsync", method =>
+                        {
+                            method
+                                .Async()
+                                .AddStatement("await _dbContainer.StopAsync();");
+                        });
+                    });
+                });
+        }
+
+        private DbStrategy GetPostgresStrategy()
+        {
+            var containerInitialization = @"_dbContainer = new PostgreSqlBuilder()
+        .WithImage(""postgres:14.7"")
+        .WithDatabase(""db"")
+        .WithUsername(""postgres"")
+        .WithPassword(""postgres"")
+        .WithCleanUp(true)
+        .Build();"
+                .ConvertToStatements();
+
+            var dbContextRegistration = @"services.AddDbContext<ApplicationDbContext>((sp, options) =>
+                {{
+                    options.UseNpgsql(
+                        _dbContainer.GetConnectionString(),
+                        b => b.MigrationsAssembly(typeof(ApplicationDbContext).Assembly.FullName));
+                    options.UseLazyLoadingProxies();
+                }});
+".ConvertToStatements();
+
+            return new DbStrategy(
+                containerType: "PostgreSqlContainer ",
+                usings: new() { "Testcontainers.PostgreSql" },
+                nuGetPackages: new() { NugetPackages.TestcontainersPostgreSql },
+                containerInitialization: containerInitialization,
+                dbContextRegistration: dbContextRegistration
+                );
+        }
+
+        private DbStrategy GetSqlServerStrategy()
+        {
+            var containerInitialization = @"_dbContainer = new MsSqlBuilder()
+                .WithImage(""mcr.microsoft.com/mssql/server:2022-latest"")
+                .WithPassword(""Strong_password_123!"")
+                .Build();"
+                .ConvertToStatements();
+
+            var dbContextRegistration = @"services.AddDbContext<ApplicationDbContext>((sp, options) =>
+                {{
+                    options.UseSqlServer(
+                        _dbContainer.GetConnectionString(),
+                        b => b.MigrationsAssembly(typeof(ApplicationDbContext).Assembly.FullName));
+                    options.UseLazyLoadingProxies();
+                }});
+".ConvertToStatements();
+
+            return new DbStrategy(
+                containerType: "MsSqlContainer",
+                usings: new() { "Testcontainers.MsSql", "Microsoft.EntityFrameworkCore" },
+                nuGetPackages: new() { NugetPackages.TestcontainersMsSql },
+                containerInitialization: containerInitialization,
+                dbContextRegistration: dbContextRegistration
+                );
+        }
+
+        public override bool CanRunTemplate()
+        {
+            return base.CanRunTemplate() && ContainerHelper.RequireRDBMSEFContainer(this);
+        }
+
+        [IntentManaged(Mode.Fully)]
+        public CSharpFile CSharpFile { get; }
+
+        [IntentManaged(Mode.Fully)]
+        protected override CSharpFileConfig DefineFileConfig()
+        {
+            return CSharpFile.GetConfig();
+        }
+
+        [IntentManaged(Mode.Fully)]
+        public override string TransformText()
+        {
+            return CSharpFile.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Modules/Intent.Modules.IntegrationTesting/Templates/ServiceEndpointTest/ServiceEndpointTestTemplatePartial.cs b/Modules/Intent.Modules.IntegrationTesting/Templates/ServiceEndpointTest/ServiceEndpointTestTemplatePartial.cs
new file mode 100644
index 0000000000..13060219d2
--- /dev/null
+++ b/Modules/Intent.Modules.IntegrationTesting/Templates/ServiceEndpointTest/ServiceEndpointTestTemplatePartial.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using Intent.Engine;
+using Intent.Modelers.Services.Api;
+using Intent.Modules.Common;
+using Intent.Modules.Common.CSharp.Builder;
+using Intent.Modules.Common.CSharp.Templates;
+using Intent.Modules.Common.Templates;
+using Intent.Modules.AspNetCore.IntegrationTesting.Settings;
+using Intent.Modules.AspNetCore.IntegrationTesting.Templates.DtoContract;
+using Intent.Modules.AspNetCore.IntegrationTesting.Templates.ProxyServiceContract;
+using Intent.Modules.Metadata.WebApi.Models;
+using Intent.RoslynWeaver.Attributes;
+using Intent.Templates;
+
+[assembly: DefaultIntentManaged(Mode.Fully)]
+[assembly: IntentTemplate("Intent.ModuleBuilder.CSharp.Templates.CSharpTemplatePartial", Version = "1.0")]
+
+namespace Intent.Modules.AspNetCore.IntegrationTesting.Templates.ServiceEndpointTest
+{
+    [IntentManaged(Mode.Ignore)]
+    public partial class ServiceEndpointTestTemplate : CSharpTemplateBase<IHttpEndpointModel>, ICSharpFileBuilderTemplate
+    {
+        public const string TemplateId = "Intent.AspNetCore.IntegrationTesting.ServiceEndpointTest";
+
+        public ServiceEndpointTestTemplate(IOutputTarget outputTarget, IHttpEndpointModel model) : base(TemplateId, outputTarget, model)
+        {
+            AddNugetDependency(NugetPackages.AutoFixture);
+            AddTypeSource(ProxyServiceContractTemplate.TemplateId);
+            AddTypeSource(DtoContractTemplate.TemplateId);
+            CSharpFile = new CSharpFile(this.GetNamespace(), this.GetFolderPath(Model.InternalElement.ParentElement.Name))
+                .AddClass($"{Model.Name}Tests", @class =>
+                {
+                    @class.AddAttribute(CSharpIntentManagedAttribute.Merge().WithSignatureFully());
+                    string collectionName = "Sequential";
+                    if (this.ExecutionContext.Settings.GetIntegrationTestSettings().ContainerIsolation().IsSharedContainer())
+                    {
+                        collectionName = "SharedContainer";
+                    }
+                    @class.AddAttribute("Collection", a => a.AddArgument($"\"{collectionName}\""));
+                    @class.WithBaseType(this.GetBaseIntegrationTestName());
+                    @class.AddConstructor(ctor =>
+                    {
+                        ctor.AddParameter(this.GetIntegrationTestWebAppFactoryName(), "factory");
+                        ctor.CallsBase(c => c.AddArgument("factory"));
+                    });
+                });
+        }
+
+        [IntentManaged(Mode.Fully)]
+        public CSharpFile CSharpFile { get; }
+
+        [IntentManaged(Mode.Fully)]
+        protected override CSharpFileConfig DefineFileConfig()
+        {
+            return CSharpFile.GetConfig();
+        }
+
+        [IntentManaged(Mode.Fully)]
+        public override string TransformText()
+        {
+            return CSharpFile.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Modules/Intent.Modules.IntegrationTesting/Templates/ServiceEndpointTest/ServiceEndpointTestTemplateRegistration.cs b/Modules/Intent.Modules.IntegrationTesting/Templates/ServiceEndpointTest/ServiceEndpointTestTemplateRegistration.cs
new file mode 100644
index 0000000000..4e5bee57f4
--- /dev/null
+++ b/Modules/Intent.Modules.IntegrationTesting/Templates/ServiceEndpointTest/ServiceEndpointTestTemplateRegistration.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Intent.Engine;
+using Intent.Metadata.Models;
+using Intent.Modelers.Services.Api;
+using Intent.Modules.Common;
+using Intent.Modules.Common.Registrations;
+using Intent.Modules.Metadata.WebApi.Models;
+using Intent.RoslynWeaver.Attributes;
+using Intent.Templates;
+
+[assembly: DefaultIntentManaged(Mode.Fully)]
+[assembly: IntentTemplate("Intent.ModuleBuilder.TemplateRegistration.FilePerModel", Version = "1.0")]
+
+namespace Intent.Modules.AspNetCore.IntegrationTesting.Templates.ServiceEndpointTest
+{
+    [IntentManaged(Mode.Ignore)]
+    public class ServiceEndpointTestTemplateRegistration : FilePerModelTemplateRegistration<IHttpEndpointModel>
+    {
+        private readonly IMetadataManager _metadataManager;
+
+        public ServiceEndpointTestTemplateRegistration(IMetadataManager metadataManager)
+        {
+            _metadataManager = metadataManager;
+        }
+
+        public override string TemplateId => ServiceEndpointTestTemplate.TemplateId;
+
+        public override ITemplate CreateTemplateInstance(IOutputTarget outputTarget, IHttpEndpointModel model)
+        {
+            return new ServiceEndpointTestTemplate(outputTarget, model);
+        }
+
+        public override IEnumerable<IHttpEndpointModel> GetModels(IApplication application)
+        {
+            return _metadataManager.GetServicesAsProxyModels(application).SelectMany(s => s.GetMappedEndpoints());
+        }
+    }
+}
\ No newline at end of file
diff --git a/Modules/Intent.Modules.MongoDb.Repositories/release-notes.md b/Modules/Intent.Modules.MongoDb.Repositories/release-notes.md
index 6787e3b3b0..7ec2bcab7c 100644
--- a/Modules/Intent.Modules.MongoDb.Repositories/release-notes.md
+++ b/Modules/Intent.Modules.MongoDb.Repositories/release-notes.md
@@ -1,7 +1,3 @@
-### Version 1.1.1
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 1.0.1
 
 - Improvement: Support for the renaming of the `IPagedResult` to `IPagedList` from the `Intent.Entities.Repositories.Api` module
diff --git a/Modules/Intent.Modules.MongoDb/release-notes.md b/Modules/Intent.Modules.MongoDb/release-notes.md
index e66d10686a..f498839daf 100644
--- a/Modules/Intent.Modules.MongoDb/release-notes.md
+++ b/Modules/Intent.Modules.MongoDb/release-notes.md
@@ -1,7 +1,3 @@
-### Version 1.0.12
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 1.0.6
 
 - Improvement: Domain Events being published now accepts cancellation token and code slightly reformatted.
diff --git a/Modules/Intent.Modules.NET.sln b/Modules/Intent.Modules.NET.sln
index 1cd576e77b..b3e931bb14 100644
--- a/Modules/Intent.Modules.NET.sln
+++ b/Modules/Intent.Modules.NET.sln
@@ -265,7 +265,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Intent.Modules.AspNetCore.I
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Intent.Modules.AspNetCore.Identity.AccountController.Metadata", "Intent.Modules.AspNetCore.Identity.AccountController.Metadata\Intent.Modules.AspNetCore.Identity.AccountController.Metadata.csproj", "{37DF17B6-66FE-4810-82D0-1A964213E4EC}"
 EndProject
-Project("{52B49DB5-3EA9-4095-B1A7-DF1AC22D7DAE}") = "Intent.Modules.Redis.Om.Repositories", "Intent.Modules.Redis.Om.Repositories\Intent.Modules.Redis.Om.Repositories.csproj", "{558F5562-D714-4264-A02D-350300A2C956}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Intent.Modules.Redis.Om.Repositories", "Intent.Modules.Redis.Om.Repositories\Intent.Modules.Redis.Om.Repositories.csproj", "{558F5562-D714-4264-A02D-350300A2C956}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Modules/Intent.Modules.ObsoleteModule/Intent.Modules.ObsoleteModule.imodspec b/Modules/Intent.Modules.ObsoleteModule/Intent.Modules.ObsoleteModule.imodspec
index f79f89d4c5..2170adc11a 100644
--- a/Modules/Intent.Modules.ObsoleteModule/Intent.Modules.ObsoleteModule.imodspec
+++ b/Modules/Intent.Modules.ObsoleteModule/Intent.Modules.ObsoleteModule.imodspec
@@ -7,7 +7,6 @@
   <description>Obsolete. The functionality of this module [explanation here] and has been deprecated. It can safely be uninstalled. NOTE: This module only serves as a sample and shouldn't be used for anything else. Please just copy the description beforehand.</description>
   <authors>Intent Architect</authors>
   <iconUrl>data:image/png;base64,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</iconUrl>
-  <releaseNotes>release-notes.md</releaseNotes>
   <templates></templates>
   <decorators></decorators>
   <factoryExtensions></factoryExtensions>
diff --git a/Modules/Intent.Modules.ObsoleteModule/release-notes.md b/Modules/Intent.Modules.ObsoleteModule/release-notes.md
index 1fc7df98ee..373ba21eb7 100644
--- a/Modules/Intent.Modules.ObsoleteModule/release-notes.md
+++ b/Modules/Intent.Modules.ObsoleteModule/release-notes.md
@@ -1,3 +1,3 @@
 ### Version 1.0.0
 
- - Obsolete: Please install [alternative module name if applicable] as this module is no longer in use. It can be safely removed.
\ No newline at end of file
+ - Update: Please install [alternative module name if applicable] as this module is no longer in use. It can be safely removed.
\ No newline at end of file
diff --git a/Modules/Intent.Modules.OpenTelemetry/release-notes.md b/Modules/Intent.Modules.OpenTelemetry/release-notes.md
index 9427d824e3..04360902d4 100644
--- a/Modules/Intent.Modules.OpenTelemetry/release-notes.md
+++ b/Modules/Intent.Modules.OpenTelemetry/release-notes.md
@@ -1,7 +1,3 @@
-### Version 2.0.1
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 2.0.0
 
 - Improvement: Updated to support use of top-level statements and minimal hosting model improvements introduced in [`Intent.AspNetCore` version 6.0.0](https://github.com/IntentArchitect/Intent.Modules.NET/blob/development/Modules/Intent.Modules.AspNetCore/release-notes.md#version-600).
diff --git a/Modules/Intent.Modules.Redis.Om.Repositories/Api/AttributeExtensionModel.cs b/Modules/Intent.Modules.Redis.Om.Repositories/Api/AttributeExtensionModel.cs
deleted file mode 100644
index 84f610ac4d..0000000000
--- a/Modules/Intent.Modules.Redis.Om.Repositories/Api/AttributeExtensionModel.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Intent.Metadata.Models;
-using Intent.Modelers.Domain.Api;
-using Intent.Modules.Common;
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.ModuleBuilder.Templates.Api.ApiElementExtensionModel", Version = "1.0")]
-
-namespace Intent.Redis.Om.Repositories.Api
-{
-    [IntentManaged(Mode.Fully, Signature = Mode.Fully)]
-    public class AttributeExtensionModel : AttributeModel
-    {
-        [IntentManaged(Mode.Fully, Body = Mode.Ignore)]
-        public AttributeExtensionModel(IElement element) : base(element)
-        {
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/Modules/Intent.Modules.Redis.Om.Repositories/Intent.Metadata/Module Builder/Intent.Redis.Om.Repositories/Elements/Designer Settings/Redis OM Key Automation__1qtlsv5z.xml b/Modules/Intent.Modules.Redis.Om.Repositories/Intent.Metadata/Module Builder/Intent.Redis.Om.Repositories/Elements/Designer Settings/Redis OM Key Automation__1qtlsv5z.xml
deleted file mode 100644
index 5c447bb0d9..0000000000
--- a/Modules/Intent.Modules.Redis.Om.Repositories/Intent.Metadata/Module Builder/Intent.Redis.Om.Repositories/Elements/Designer Settings/Redis OM Key Automation__1qtlsv5z.xml	
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<class id="2c841f19-9f06-4814-abae-07d8cf4698e3" type="Designer Settings" typeId="7a6411a8-ffef-4209-91c6-8d12755a806a">
-  <name>Redis OM Key Automation</name>
-  <display>Redis OM Key Automation</display>
-  <isAbstract>false</isAbstract>
-  <sort-children>by-type-then-by-name</sort-children>
-  <genericTypes />
-  <isMapped>false</isMapped>
-  <parentFolderId>a05f72ac-b8b4-4dbe-996c-a60979511ab3</parentFolderId>
-  <packageId>739f3162-d1f8-4609-86df-756c6ff6b7e3</packageId>
-  <packageName>Intent.Redis.Om.Repositories</packageName>
-  <stereotypes>
-    <stereotype stereotypeDefinitionId="81e5637b-05d7-43a4-9619-6ef873be9f47" name="Designer Settings">
-      <addedByDefault>true</addedByDefault>
-      <definitionPackageName>Intent.ModuleBuilder</definitionPackageName>
-      <definitionPackageId>9972b2a9-b749-4bba-b5c8-824bf694c6ef</definitionPackageId>
-      <properties>
-        <property name="9566aa04-ab84-4fbc-b039-6e676159ed82" display="Is Reference" value="false" isActive="true" />
-        <property name="fdbbd211-a162-4f29-bcdb-1250309d8aef" display="Extend Designers" value="[&quot;6ab29b31-27af-4f56-a67c-986d82097d63&quot;]" isActive="true" />
-      </properties>
-    </stereotype>
-  </stereotypes>
-  <metadata />
-  <childElements />
-</class>
\ No newline at end of file
diff --git a/Modules/Intent.Modules.Redis.Om.Repositories/Intent.Metadata/Module Builder/Intent.Redis.Om.Repositories/Elements/Designers Folder/designers__cxgfbv0v.xml b/Modules/Intent.Modules.Redis.Om.Repositories/Intent.Metadata/Module Builder/Intent.Redis.Om.Repositories/Elements/Designers Folder/designers__cxgfbv0v.xml
deleted file mode 100644
index 9d27fa5de8..0000000000
--- a/Modules/Intent.Modules.Redis.Om.Repositories/Intent.Metadata/Module Builder/Intent.Redis.Om.Repositories/Elements/Designers Folder/designers__cxgfbv0v.xml	
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<class id="a05f72ac-b8b4-4dbe-996c-a60979511ab3" type="Designers Folder" typeId="dbb71aa5-0db2-4a2a-97a9-501950f36f99">
-  <name>designers</name>
-  <display>designers</display>
-  <isAbstract>false</isAbstract>
-  <sort-children>by-type-then-by-name</sort-children>
-  <genericTypes />
-  <isMapped>false</isMapped>
-  <parentFolderId>739f3162-d1f8-4609-86df-756c6ff6b7e3</parentFolderId>
-  <packageId>739f3162-d1f8-4609-86df-756c6ff6b7e3</packageId>
-  <packageName>Intent.Redis.Om.Repositories</packageName>
-  <stereotypes />
-  <metadata />
-  <childElements />
-</class>
\ No newline at end of file
diff --git a/Modules/Intent.Modules.Redis.Om.Repositories/Intent.Metadata/Module Builder/Intent.Redis.Om.Repositories/Elements/Element Extension/Attribute Extension__c20qzzfw.xml b/Modules/Intent.Modules.Redis.Om.Repositories/Intent.Metadata/Module Builder/Intent.Redis.Om.Repositories/Elements/Element Extension/Attribute Extension__c20qzzfw.xml
deleted file mode 100644
index 508b5ea331..0000000000
--- a/Modules/Intent.Modules.Redis.Om.Repositories/Intent.Metadata/Module Builder/Intent.Redis.Om.Repositories/Elements/Element Extension/Attribute Extension__c20qzzfw.xml	
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<class id="2cf21aa0-73ac-41c2-ada8-209f450a7f10" type="Element Extension" typeId="e3c7b1ca-f080-45c1-b56f-8d44226c8e20">
-  <name>Attribute Extension</name>
-  <display>Attribute Extension: Attribute</display>
-  <isAbstract>false</isAbstract>
-  <sort-children>by-type-then-manually</sort-children>
-  <genericTypes />
-  <typeReference id="87b6ab43-bc1a-439b-8812-56cf91360226">
-    <typeId>0090fb93-483e-41af-a11d-5ad2dc796adf</typeId>
-    <isNavigable>true</isNavigable>
-    <isNullable>false</isNullable>
-    <isCollection>false</isCollection>
-    <isRequired>true</isRequired>
-    <typePackageName>Intent.Modelers.Domain</typePackageName>
-    <typePackageId>6572b98d-5e13-4d4b-9ffc-820057da974e</typePackageId>
-    <stereotypes />
-    <genericTypeParameters />
-  </typeReference>
-  <isMapped>false</isMapped>
-  <parentFolderId>2c841f19-9f06-4814-abae-07d8cf4698e3</parentFolderId>
-  <packageId>739f3162-d1f8-4609-86df-756c6ff6b7e3</packageId>
-  <packageName>Intent.Redis.Om.Repositories</packageName>
-  <stereotypes>
-    <stereotype stereotypeDefinitionId="159cbc8e-a910-40f7-8e45-3edadbb863c2" name="Type Reference Extension Settings">
-      <addedByDefault>true</addedByDefault>
-      <definitionPackageName>Intent.ModuleBuilder</definitionPackageName>
-      <definitionPackageId>9972b2a9-b749-4bba-b5c8-824bf694c6ef</definitionPackageId>
-      <properties>
-        <property name="35226a83-3965-4224-8aef-20c68a0c5180" display="Mode" value="Inherit" isActive="true" />
-        <property name="7d3859d4-084d-4ff0-8b31-850b4a8f8cd0" display="Display Name" isActive="false" />
-        <property name="17223dbd-8df0-4700-8b81-02274ca3ed7f" display="Hint" isActive="false" />
-        <property name="b2cef034-5706-45d2-8554-f4dc582a18ff" display="Target Types" isActive="false" />
-        <property name="93e4efa9-186d-4e88-ae0a-491bcd6e6f5e" display="Default Type Id" isActive="false" />
-        <property name="7a0c4185-1c08-4d3e-9185-14683d7a3bd0" display="Allow Collection" value="Inherit" isActive="false" />
-        <property name="e3dc90ec-4f5f-4f20-b271-e28a5094dc91" display="Allow Nullable" value="Inherit" isActive="false" />
-      </properties>
-    </stereotype>
-    <stereotype stereotypeDefinitionId="312eab00-f6db-492e-bbb4-e41383c8d3d8" name="Extension Settings">
-      <addedByDefault>true</addedByDefault>
-      <definitionPackageName>Intent.ModuleBuilder</definitionPackageName>
-      <definitionPackageId>9972b2a9-b749-4bba-b5c8-824bf694c6ef</definitionPackageId>
-      <properties>
-        <property name="8c964307-9d03-4a14-9fd3-40ea2607955a" display="Display Text Function" value="" isActive="true" />
-        <property name="996ed45f-2318-4587-9618-73db3d7cfed0" display="Validate Function" value="" isActive="true" />
-      </properties>
-    </stereotype>
-  </stereotypes>
-  <metadata />
-  <childElements>
-    <childElement id="511072a4-d569-42d7-8f71-90382557965e" type="Element Event Settings" typeId="3c628ab0-2407-4fb0-8507-ddde986cff2e">
-      <name>NewElementEventSettings</name>
-      <display>[events]</display>
-      <isAbstract>false</isAbstract>
-      <sort-children>by-type-then-by-name</sort-children>
-      <genericTypes />
-      <isMapped>false</isMapped>
-      <parentFolderId>2cf21aa0-73ac-41c2-ada8-209f450a7f10</parentFolderId>
-      <packageId>739f3162-d1f8-4609-86df-756c6ff6b7e3</packageId>
-      <packageName>Intent.Redis.Om.Repositories</packageName>
-      <stereotypes />
-      <metadata />
-      <childElements>
-        <childElement id="0cbf3db1-00ed-4072-8ca2-38d09c1eeade" type="Element Event Handler" typeId="0ef412e3-d15a-45d3-bcd3-f646165f2eb6">
-          <name>On Created</name>
-          <display>On Created: Script</display>
-          <isAbstract>false</isAbstract>
-          <genericTypes />
-          <typeReference id="9405b008-acf2-4f72-8c8b-68929d22246b">
-            <typeId>043eee26-1591-42ac-9f2c-fc911b070eb1</typeId>
-            <isNavigable>true</isNavigable>
-            <isNullable>false</isNullable>
-            <isCollection>false</isCollection>
-            <isRequired>true</isRequired>
-            <typePackageName>Intent.ModuleBuilder</typePackageName>
-            <typePackageId>9972b2a9-b749-4bba-b5c8-824bf694c6ef</typePackageId>
-            <stereotypes />
-            <genericTypeParameters />
-          </typeReference>
-          <isMapped>false</isMapped>
-          <parentFolderId>511072a4-d569-42d7-8f71-90382557965e</parentFolderId>
-          <packageId>739f3162-d1f8-4609-86df-756c6ff6b7e3</packageId>
-          <packageName>Intent.Redis.Om.Repositories</packageName>
-          <stereotypes>
-            <stereotype stereotypeDefinitionId="56bc0465-c1fe-4bca-9493-2a3ce88a4047" name="Script Settings">
-              <addedByDefault>true</addedByDefault>
-              <definitionPackageName>Intent.ModuleBuilder</definitionPackageName>
-              <definitionPackageId>9972b2a9-b749-4bba-b5c8-824bf694c6ef</definitionPackageId>
-              <properties>
-                <property name="73a4088f-626e-4d31-b0b2-113167f015b2" display="Script" value="const IndexedStereotypeId = &quot;e1fc703d-389d-4241-aee1-ee6ce385bbc0&quot;;&#xD;&#xA;const PrimaryKeyStereotypeId = &quot;64f6a994-4909-4a9d-a0a9-afc5adf2ef74&quot;;&#xD;&#xA;&#xD;&#xA;if (element.hasStereotype(PrimaryKeyStereotypeId)) {&#xD;&#xA;    element.addStereotype(IndexedStereotypeId);&#xD;&#xA;}" isActive="true" />
-              </properties>
-            </stereotype>
-          </stereotypes>
-          <metadata />
-          <childElements />
-        </childElement>
-      </childElements>
-    </childElement>
-  </childElements>
-</class>
\ No newline at end of file
diff --git a/Modules/Intent.Modules.Redis.Om.Repositories/Intent.Metadata/Module Builder/Intent.Redis.Om.Repositories/Intent.Redis.Om.Repositories.pkg.config b/Modules/Intent.Modules.Redis.Om.Repositories/Intent.Metadata/Module Builder/Intent.Redis.Om.Repositories/Intent.Redis.Om.Repositories.pkg.config
index 4b92963042..9494daaa95 100644
--- a/Modules/Intent.Modules.Redis.Om.Repositories/Intent.Metadata/Module Builder/Intent.Redis.Om.Repositories/Intent.Redis.Om.Repositories.pkg.config	
+++ b/Modules/Intent.Modules.Redis.Om.Repositories/Intent.Metadata/Module Builder/Intent.Redis.Om.Repositories/Intent.Redis.Om.Repositories.pkg.config	
@@ -31,7 +31,7 @@
       <definitionPackageName>Intent.ModuleBuilder</definitionPackageName>
       <definitionPackageId>9972b2a9-b749-4bba-b5c8-824bf694c6ef</definitionPackageId>
       <properties>
-        <property name="4bb9695b-6004-46e1-acea-c48c60c5f8ce" display="Version" value="1.0.0-pre.1" isActive="true" />
+        <property name="4bb9695b-6004-46e1-acea-c48c60c5f8ce" display="Version" value="1.0.0-pre.0" isActive="true" />
         <property name="a1a18442-64fd-49da-a2e3-8ef857affd31" display="Icon" isActive="true" />
         <property name="177a2415-e749-46e7-8257-440e19ecfb5e" display="API Namespace" isActive="true" />
         <property name="0d2ae582-090e-42d6-a7d6-689144433254" display="NuGet Package Id" isActive="true" />
@@ -39,7 +39,7 @@
         <property name="d40394fc-ed23-45a0-9c56-cbcf1c928e47" display="Include in Module" value="true" isActive="true" />
         <property name="959b2f6f-bc0f-42d3-8cae-7b3686037b2f" display="Reference in" value="Selected Designers" isActive="true" />
         <property name="27d378b6-9011-4ced-86b7-b976d690ceb7" display="Reference in Designer" value="[&quot;6ab29b31-27af-4f56-a67c-986d82097d63&quot;]" isActive="true" />
-        <property name="2e0e1191-139f-4d1d-8ad5-d6b5751f2555" display="Include Release Notes" value="true" isActive="true" />
+        <property name="2e0e1191-139f-4d1d-8ad5-d6b5751f2555" display="Include Release Notes" value="false" isActive="true" />
         <property name="8f423f80-4722-41bd-9060-2273c723cb2c" display="Project URL" value="" isActive="true" />
       </properties>
     </stereotype>
diff --git a/Modules/Intent.Modules.Redis.Om.Repositories/Intent.Modules.Redis.OM.Repositories.application.output.log b/Modules/Intent.Modules.Redis.Om.Repositories/Intent.Modules.Redis.OM.Repositories.application.output.log
index a1e3a253f6..397de455cc 100644
--- a/Modules/Intent.Modules.Redis.Om.Repositories/Intent.Modules.Redis.OM.Repositories.application.output.log
+++ b/Modules/Intent.Modules.Redis.Om.Repositories/Intent.Modules.Redis.OM.Repositories.application.output.log
@@ -16,14 +16,6 @@
       <ProjectRelativeFilePath>AssociationTargetEndModelStereotypeExtensions.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
-    <FileLog>
-      <ProjectId>8faa0157-30e3-4806-9ebf-c8c68a4574a1</ProjectId>
-      <CorrelationId>Intent.ModuleBuilder.Templates.Api.ApiElementExtensionModel#2cf21aa0-73ac-41c2-ada8-209f450a7f10</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>Api/AttributeExtensionModel.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>AttributeExtensionModel.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
     <FileLog>
       <ProjectId>8faa0157-30e3-4806-9ebf-c8c68a4574a1</ProjectId>
       <CorrelationId>Intent.ModuleBuilder.Templates.Api.ApiElementModelExtensions#0090fb93-483e-41af-a11d-5ad2dc796adf</CorrelationId>
@@ -64,22 +56,6 @@
       <ProjectRelativeFilePath>Intent.Redis.Om.Repositories.imodspec</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
-    <FileLog>
-      <ProjectId>4c07d5ea-2bf9-46d3-9811-4a50b1c50e43</ProjectId>
-      <CorrelationId>Intent.ModuleBuilder.DesignerSettings#2c841f19-9f06-4814-abae-07d8cf4698e3</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>modelers/Redis OM Key Automation.designer.settings</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Redis OM Key Automation.designer.settings</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>558f5562-d714-4264-a02d-350300a2c956</ProjectId>
-      <CorrelationId>Intent.ModuleBuilder.Templates.ReleaseNotes</CorrelationId>
-      <OverwriteBehaviour>once-off</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>release-notes.md</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>release-notes.md</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
     <FileLog>
       <ProjectId>ca825114-0097-4612-a06d-127d4acc837d</ProjectId>
       <CorrelationId>Intent.ModuleBuilder.Templates.TemplateExtensions</CorrelationId>
diff --git a/Modules/Intent.Modules.Redis.Om.Repositories/Intent.Redis.Om.Repositories.imodspec b/Modules/Intent.Modules.Redis.Om.Repositories/Intent.Redis.Om.Repositories.imodspec
index 127056acd5..39cb4b8f85 100644
--- a/Modules/Intent.Modules.Redis.Om.Repositories/Intent.Redis.Om.Repositories.imodspec
+++ b/Modules/Intent.Modules.Redis.Om.Repositories/Intent.Redis.Om.Repositories.imodspec
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package>
   <id>Intent.Redis.Om.Repositories</id>
-  <version>1.0.0-pre.2</version>
+  <version>1.0.0-pre.0</version>
   <supportedClientVersions>[4.1.0-beta.21,5.0.0)</supportedClientVersions>
   <summary>Implements the Repository pattern using Redis OM .NET for handling documents in the Redis Stack.</summary>
   <description>Implements the Repository pattern using Redis OM .NET for handling documents in the Redis Stack.</description>
@@ -152,7 +152,5 @@
   <moduleSettingsExtensions />
   <metadata>
     <install target="Domain" src="Intent.Metadata/Module Builder/Intent.Redis.Om.Repositories/Intent.Redis.Om.Repositories.pkg.config" externalReference="739f3162-d1f8-4609-86df-756c6ff6b7e3" />
-    <install target="Domain" src="modelers/Redis OM Key Automation.designer.settings" externalReference="2c841f19-9f06-4814-abae-07d8cf4698e3" />
   </metadata>
-  <releaseNotes>release-notes.md</releaseNotes>
 </package>
\ No newline at end of file
diff --git a/Modules/Intent.Modules.Redis.Om.Repositories/Templates/Templates/RedisOmRepository/RedisOmRepositoryTemplatePartial.cs b/Modules/Intent.Modules.Redis.Om.Repositories/Templates/Templates/RedisOmRepository/RedisOmRepositoryTemplatePartial.cs
index 0a4694835c..d6bef2532d 100644
--- a/Modules/Intent.Modules.Redis.Om.Repositories/Templates/Templates/RedisOmRepository/RedisOmRepositoryTemplatePartial.cs
+++ b/Modules/Intent.Modules.Redis.Om.Repositories/Templates/Templates/RedisOmRepository/RedisOmRepositoryTemplatePartial.cs
@@ -146,8 +146,7 @@ public override void AfterTemplateRegistration()
             }
         }
 
-        [IntentManaged(Mode.Fully)]
-        public CSharpFile CSharpFile { get; }
+        [IntentManaged(Mode.Fully)] public CSharpFile CSharpFile { get; }
 
         [IntentManaged(Mode.Fully)]
         protected override CSharpFileConfig DefineFileConfig()
diff --git a/Modules/Intent.Modules.Redis.Om.Repositories/Templates/Templates/RedisOmRepositoryBase/RedisOmRepositoryBaseTemplatePartial.cs b/Modules/Intent.Modules.Redis.Om.Repositories/Templates/Templates/RedisOmRepositoryBase/RedisOmRepositoryBaseTemplatePartial.cs
index 5c4c0ba2d5..b8b0872fcc 100644
--- a/Modules/Intent.Modules.Redis.Om.Repositories/Templates/Templates/RedisOmRepositoryBase/RedisOmRepositoryBaseTemplatePartial.cs
+++ b/Modules/Intent.Modules.Redis.Om.Repositories/Templates/Templates/RedisOmRepositoryBase/RedisOmRepositoryBaseTemplatePartial.cs
@@ -38,7 +38,6 @@ public RedisOmRepositoryBaseTemplate(IOutputTarget outputTarget, IList<ClassMode
                 .AddUsing("System.Linq.Expressions")
                 .AddUsing("System.Threading")
                 .AddUsing("System.Threading.Tasks")
-                .AddUsing("System.Reflection")
                 .AddClass("RedisOmRepositoryBase", @class =>
                 {
                     @class
@@ -206,7 +205,7 @@ public RedisOmRepositoryBaseTemplate(IOutputTarget outputTarget, IList<ClassMode
                         var tDomainStateGenericTypeArgument = createEntityInterfaces
                             ? $", {tDomainState}"
                             : string.Empty;
-
+                        
                         method.AddStatements(
                             """
                             var query = _collection;
@@ -369,8 +368,7 @@ private string GetNullablePostfix(bool isNullable)
             return isNullable && OutputTarget.GetProject().NullableEnabled ? "?" : "";
         }
 
-        [IntentManaged(Mode.Fully)]
-        public CSharpFile CSharpFile { get; }
+        [IntentManaged(Mode.Fully)] public CSharpFile CSharpFile { get; }
 
         [IntentManaged(Mode.Fully)]
         protected override CSharpFileConfig DefineFileConfig()
diff --git a/Modules/Intent.Modules.Redis.Om.Repositories/Templates/Templates/RedisOmRepositoryInterface/RedisOmRepositoryInterfaceTemplatePartial.cs b/Modules/Intent.Modules.Redis.Om.Repositories/Templates/Templates/RedisOmRepositoryInterface/RedisOmRepositoryInterfaceTemplatePartial.cs
index 6d31a1fa0c..914f0f8ed2 100644
--- a/Modules/Intent.Modules.Redis.Om.Repositories/Templates/Templates/RedisOmRepositoryInterface/RedisOmRepositoryInterfaceTemplatePartial.cs
+++ b/Modules/Intent.Modules.Redis.Om.Repositories/Templates/Templates/RedisOmRepositoryInterface/RedisOmRepositoryInterfaceTemplatePartial.cs
@@ -48,7 +48,7 @@ public RedisOmRepositoryInterfaceTemplate(IOutputTarget outputTarget, IList<Clas
                         .AddProperty(this.GetRedisOmUnitOfWorkInterfaceName(), "UnitOfWork", property => property
                             .WithoutSetter()
                         )
-                        .AddMethod($"Task<{tDomain}{GetNullablePostfix(true)}>", "FindAsync", method => method
+                        .AddMethod($"Task<{tDomain}{GetNullablePostfix(true)}>", "FindAsync", method=>method
                             .AddParameter($"Expression<Func<{toDocumentInterface}, bool>>", "filterExpression")
                             .AddOptionalCancellationTokenParameter(this))
                         .AddMethod($"Task<List<{tDomain}>>", "FindAllAsync", method => method
@@ -108,7 +108,7 @@ public override void AfterTemplateRegistration()
                 }, 1000);
             }
         }
-
+        
         private string GetNullablePostfix(bool isNullable)
         {
             return isNullable && OutputTarget.GetProject().NullableEnabled ? "?" : "";
diff --git a/Modules/Intent.Modules.Redis.Om.Repositories/Templates/Templates/ReflectionHelper/ReflectionHelperTemplatePartial.cs b/Modules/Intent.Modules.Redis.Om.Repositories/Templates/Templates/ReflectionHelper/ReflectionHelperTemplatePartial.cs
index ddec588817..994259b277 100644
--- a/Modules/Intent.Modules.Redis.Om.Repositories/Templates/Templates/ReflectionHelper/ReflectionHelperTemplatePartial.cs
+++ b/Modules/Intent.Modules.Redis.Om.Repositories/Templates/Templates/ReflectionHelper/ReflectionHelperTemplatePartial.cs
@@ -30,37 +30,62 @@ public ReflectionHelperTemplate(IOutputTarget outputTarget, object model = null)
                 {
                     @class.Internal().Static();
 
-                    @class.AddMethod("T", "CreateNewInstanceOf", method =>
+                    if (ReflectionConstructionRequired())
                     {
-                        method.Static();
-                        method.AddGenericParameter("T", out var t);
-
-                        method.AddStatements(new[]
+                        @class.AddMethod("T", "CreateNewInstanceOf", method =>
                         {
-                            $"var constructorInfo = typeof({t}).GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, Array.Empty<Type>(), null)!;",
-                            $"var instance = ({t})constructorInfo.Invoke({UseType("System.Array")}.Empty<object>());",
-                            "return instance;"
+                            method.Static();
+                            method.AddGenericParameter("T", out var t);
+
+                            method.AddStatements(new[]
+                            {
+                                $"var constructorInfo = typeof({t}).GetConstructor(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, Array.Empty<Type>(), null)!;",
+                                $"var instance = ({t})constructorInfo.Invoke({UseType("System.Array")}.Empty<object>());",
+                                "return instance;"
+                            });
                         });
-                    });
+                    }
 
-                    @class.AddMethod("void", "ForceSetProperty", method =>
+                    if (ReflectionPropertySettingRequired())
                     {
-                        method.Static();
-                        method.AddGenericParameter("T", out var t);
-                        method.AddParameter(t, "instance");
-                        method.AddParameter("string", "propertyName");
-                        method.AddParameter("object?", "value");
-
-                        method.AddStatements(new[]
+                        @class.AddMethod("void", "ForceSetProperty", method =>
                         {
-                            $"var propertyInfo = typeof({t}).GetProperty(propertyName)!;",
-                            "propertyInfo = propertyInfo.DeclaringType!.GetProperty(propertyName)!;",
-                            "propertyInfo.SetValue(instance, value, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, null, null);"
+                            method.Static();
+                            method.AddGenericParameter("T", out var t);
+                            method.AddParameter(t, "instance");
+                            method.AddParameter("string", "propertyName");
+                            method.AddParameter("object?", "value");
+
+                            method.AddStatements(new[]
+                            {
+                                $"var propertyInfo = typeof({t}).GetProperty(propertyName)!;",
+                                "propertyInfo = propertyInfo.DeclaringType!.GetProperty(propertyName)!;",
+                                "propertyInfo.SetValue(instance, value, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, null, null, null);"
+                            });
                         });
-                    });
+                    }
                 });
         }
 
+        private bool ReflectionConstructionRequired()
+        {
+            var domainDesigner = ExecutionContext.MetadataManager.Domain(ExecutionContext.GetApplicationConfig().Id);
+
+            return domainDesigner.GetValueObjects().Any() ||
+                   domainDesigner.GetClassModels().Any(x =>
+                       x.Constructors.Any() && x.Constructors.All(y => y.Parameters.Count != 0));
+        }
+
+        public bool ReflectionPropertySettingRequired()
+        {
+            return ExecutionContext.Settings.GetDomainSettings().EnsurePrivatePropertySetters() ||
+                   ExecutionContext.MetadataManager.Domain(ExecutionContext.GetApplicationConfig().Id).GetValueObjects().Any();
+        }
+
+        public override bool CanRunTemplate()
+        {
+            return base.CanRunTemplate() && (ReflectionConstructionRequired() || ReflectionPropertySettingRequired());
+        }
 
         [IntentManaged(Mode.Fully)]
         public CSharpFile CSharpFile { get; }
diff --git a/Modules/Intent.Modules.Redis.Om.Repositories/modelers/Redis OM Key Automation.designer.settings b/Modules/Intent.Modules.Redis.Om.Repositories/modelers/Redis OM Key Automation.designer.settings
deleted file mode 100644
index 7827d47d2c..0000000000
--- a/Modules/Intent.Modules.Redis.Om.Repositories/modelers/Redis OM Key Automation.designer.settings	
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<settings version="3.1.1">
-  <id>2c841f19-9f06-4814-abae-07d8cf4698e3</id>
-  <name>Redis OM Key Automation</name>
-  <designerReferences />
-  <packageSettings />
-  <packageExtensions />
-  <elementSettings />
-  <elementExtensions>
-    <elementExtension type="Attribute" typeId="0090fb93-483e-41af-a11d-5ad2dc796adf">
-      <mappingSettings />
-      <macros>
-        <macro trigger="on-created">
-          <script>const IndexedStereotypeId = "e1fc703d-389d-4241-aee1-ee6ce385bbc0";
-const PrimaryKeyStereotypeId = "64f6a994-4909-4a9d-a0a9-afc5adf2ef74";
-
-if (element.hasStereotype(PrimaryKeyStereotypeId)) {
-    element.addStereotype(IndexedStereotypeId);
-}</script>
-        </macro>
-      </macros>
-    </elementExtension>
-  </elementExtensions>
-  <associationSettings />
-  <associationExtensions />
-  <mappingSettings />
-  <mappableElementPackages />
-  <mappableElementPackageExtensions />
-</settings>
\ No newline at end of file
diff --git a/Modules/Intent.Modules.Redis.Om.Repositories/release-notes.md b/Modules/Intent.Modules.Redis.Om.Repositories/release-notes.md
deleted file mode 100644
index 6f5c2d49f5..0000000000
--- a/Modules/Intent.Modules.Redis.Om.Repositories/release-notes.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### Version 1.0.0
-
-- New Feature: Model document Entities to be persisted in a Redis Stack instance using the [Redis OM (Object Mapper)](https://redis.io/docs/connect/clients/om-clients/stack-dotnet/) library.
\ No newline at end of file
diff --git a/Modules/Intent.Modules.Security.BearerToken.Interop.IdentityServer4/release-notes.md b/Modules/Intent.Modules.Security.BearerToken.Interop.IdentityServer4/release-notes.md
index 99f8385205..78dae439f7 100644
--- a/Modules/Intent.Modules.Security.BearerToken.Interop.IdentityServer4/release-notes.md
+++ b/Modules/Intent.Modules.Security.BearerToken.Interop.IdentityServer4/release-notes.md
@@ -1,7 +1,3 @@
-### Version 4.1.2
-
-- Improvement: Dependent modules changed, version bumped.
-- 
 ### Version 4.1.1
 
 - Updated based on other Module changes.
diff --git a/Modules/Intent.Modules.Security.JWT/release-notes.md b/Modules/Intent.Modules.Security.JWT/release-notes.md
index 5962400ad2..46fe56ea1d 100644
--- a/Modules/Intent.Modules.Security.JWT/release-notes.md
+++ b/Modules/Intent.Modules.Security.JWT/release-notes.md
@@ -1,7 +1,3 @@
-### Version 4.2.0
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
-
 ### Version 4.1.7
 
 - Improvement: Updated to be compatible with .NET 8.
diff --git a/Modules/Intent.Modules.Security.MSAL/release-notes.md b/Modules/Intent.Modules.Security.MSAL/release-notes.md
index af05a05b1c..8de8c41b3e 100644
--- a/Modules/Intent.Modules.Security.MSAL/release-notes.md
+++ b/Modules/Intent.Modules.Security.MSAL/release-notes.md
@@ -1,7 +1,3 @@
-### Version 4.2.0
-
-- Improvement: Upgraded module to support new 4.1 SDK features.
- 
 ### Version 4.1.7
 
 - Improvement: Updated to be compatible with .NET 8.
diff --git a/Modules/Intent.Modules.UnitOfWork.Persistence.Shared/PersistenceUnitOfWork.cs b/Modules/Intent.Modules.UnitOfWork.Persistence.Shared/PersistenceUnitOfWork.cs
index 56b17452d4..228c7bbd07 100644
--- a/Modules/Intent.Modules.UnitOfWork.Persistence.Shared/PersistenceUnitOfWork.cs
+++ b/Modules/Intent.Modules.UnitOfWork.Persistence.Shared/PersistenceUnitOfWork.cs
@@ -181,7 +181,7 @@ public static void ApplyUnitOfWorkImplementations(
                 usingBlock =>
                 {
                     hasCSharpStatements = usingBlock;
-                    usingBlock.BeforeSeparator = includeComments ? CSharpCodeSeparatorType.None : CSharpCodeSeparatorType.EmptyLines;
+                    usingBlock.BeforeSeparator = CSharpCodeSeparatorType.None;
                     usingBlock.AddMetadata("transaction", "using-block");
                 });
         }
diff --git a/PipelineScripts/pre-build-validation.ps1 b/PipelineScripts/pre-build-validation.ps1
deleted file mode 100644
index 97bff480f8..0000000000
--- a/PipelineScripts/pre-build-validation.ps1
+++ /dev/null
@@ -1,186 +0,0 @@
-class ImodSpecInfo {
-    [string]$FilePath
-    [string]$DirectoryPath
-    [string]$Id
-    [VersionInfo]$Version
-    [string]$Authors
-    [string]$Summary
-    [string]$Description
-    [Boolean]$IsObsolete
-    [Dependency[]]$Dependencies
-    [string]$ReleaseNotes
-
-    ImodSpecInfo([string]$filePath, [xml]$content) {
-        $this.FilePath = $filePath
-        $this.DirectoryPath = [System.IO.Path]::GetDirectoryName($filePath)
-        $this.Id = $content.package.id
-        $this.Version = if (-not [System.String]::IsNullOrWhiteSpace($content.package.version)) { [VersionInfo]::new($content.package.version) } else { $null }
-        $this.Authors = $content.package.authors
-        $this.Summary = $content.package.summary
-        $this.Description = $content.package.description
-        $this.IsObsolete = $this.Description.ToLower().Contains("obsolete")
-        $this.Dependencies = $content.package.dependencies.dependency | Where-Object { $null -ne $_.Id } | ForEach-Object { [Dependency]::new($_.id, $_.version) }
-        $this.ReleaseNotes = $content.package.releaseNotes
-    }
-}
-
-class Dependency {
-    [string]$Id
-    [VersionInfo]$Version
-
-    Dependency(
-        [string]$Id,
-        [string]$Version
-    ) {
-        $this.Id = $Id
-        $this.Version = if (-not [System.String]::IsNullOrWhiteSpace($Version)) { [VersionInfo]::new($Version) } else { $null }
-    }
-}
-
-class VersionInfo {
-    [string]$OriginalVersion
-    [int]$Major = 0
-    [int]$Minor = 0
-    [int]$Build = 0
-    [string]$Revision = $null
-
-    VersionInfo([string]$versionString) {
-        $this.OriginalVersion = $versionString
-        $this.ExtractVersionParts($versionString)
-    }
-
-    [void]ExtractVersionParts([string]$versionString) {
-        $pattern = '^(\d+)\.(\d+)\.(\d+)(?:-([A-Za-z0-9.]+))?$'
-        
-        if ($versionString -match $pattern) {
-            $this.Major = [int]$matches[1]
-            $this.Minor = [int]$matches[2]
-            $this.Build = [int]$matches[3]
-            if ($matches[4]) {
-                $this.Revision = $matches[4]
-            }
-        } else {
-            Write-Host "Version format not recognized: $($versionString)."
-        }
-    }
-
-    [string]ToString() {
-        if ($null -ne $this.Revision) {
-            return "$($this.Major).$($this.Minor).$($this.Build)-$($this.Revision)"
-        } else {
-            return "$($this.Major).$($this.Minor).$($this.Build)"
-        }
-    }
-}
-
-$projectName = $args[0]
-$imodSpecInfos = New-Object 'System.Collections.Generic.Dictionary[string, ImodSpecInfo]'
-$global:hasError = $false
-
-if ([System.String]::IsNullOrWhiteSpace($projectName)) {
-    Write-Error "First argument not set: Project name."
-    exit 1;
-}
-
-Get-ChildItem -Path Modules -Filter *.imodspec -Recurse -Depth 2 | ForEach-Object {
-    $file = $_.FullName
-    
-    [xml]$content = Get-Content $file
-
-    $spec = [ImodSpecInfo]::new($_.FullName, $content)
-    if ($imodSpecInfos.ContainsKey($spec.Id)) {
-        Write-Host "There is a duplicate Module Id found: $($spec.Id)"
-        Write-Host "  - $($file)"
-        Write-Host "  - $($imodSpecInfos[$spec.Id].FilePath)"
-        $global:hasError = $true
-        $global:hasError > $null # Quench the warning since this is being used in other parts of the script
-    } else {
-        $imodSpecInfos.Add($spec.Id, $spec)
-    }
-}
-
-$validationRules = @{
-    Authors = { 
-        param([ImodSpecInfo]$info) 
-        if ($info.Authors -eq $projectName) { 
-            return "Authors not set" 
-        } 
-    }
-    Summary = { 
-        param([ImodSpecInfo]$info) 
-        if ($info.Summary -eq "A custom module for $($projectName).") { 
-            return "Summary not set" 
-        } 
-    }
-    Description = { 
-        param([ImodSpecInfo]$info) 
-        if ($info.Description -eq "A custom module for $($projectName).") { 
-            return "Description not set" 
-        } 
-    }
-    Obsolete = { 
-        param([ImodSpecInfo]$info)
-        $obsoleteDependencies = $info.Dependencies | Where-Object { 
-            $imodSpecInfos.ContainsKey($_.Id) -and $imodSpecInfos[$_.Id].IsObsolete 
-        }
-        if ($obsoleteDependencies) {
-            return "Contains obsolete dependencies: $($obsoleteDependencies.Id -join ', ')"
-        }
-    }
-    HasVersion = {
-        param([ImodSpecInfo]$info)
-        if ($info.Version -eq $null) {
-            return "Does not have a version specified"
-        }
-        if ($info.Dependencies -ne $null) {
-            $missingVersions = @($info.Dependencies | Where-Object {
-                $_.Version -eq $null
-            })
-            if ($missingVersions.Count -gt 0) {
-                return "Dependencies with missing versions: $($missingVersions.Id -join ', ')"
-            }
-        }
-    }
-    HasReleaseNotes = { 
-        param([ImodSpecInfo]$info) 
-        if ($info.ReleaseNotes -ne $null -and [System.String]::IsNullOrWhiteSpace($info.ReleaseNotes)) { 
-            return "No release notes defined" 
-        } 
-    }
-    MissingVersionInReleaseNotes = { 
-        param([ImodSpecInfo]$info)
-        if ([System.String]::IsNullOrWhiteSpace($info.ReleaseNotes)) { 
-            return $null 
-        }
-        $releaseNoteFile = [System.IO.Path]::Combine($info.DirectoryPath, $info.ReleaseNotes)
-        if (-not [System.IO.File]::Exists($releaseNoteFile)) {
-            return "Could not locate release notes file: $($releaseNoteFile)"
-        }
-        [string]$releaseNotesContent = Get-Content $releaseNoteFile
-        $targetVersion = "$($info.Version.Major).$($info.Version.Minor).$($info.Version.Build)"
-        if (-not $releaseNotesContent.Contains($targetVersion)) {
-            return "Could not locate version number $($targetVersion) in release notes"
-        }
-    }
-}
-
-foreach ($info in $imodSpecInfos.Values) {
-    $reportedFileName = $false
-
-    foreach ($rule in $validationRules.GetEnumerator()) {
-        $result = & $rule.Value $info
-        if ($result) {
-            if (-not $reportedFileName) {
-                Write-Host "# $($info.FilePath)"
-                $reportedFileName = $true
-            }
-            Write-Host "  - $($result)"
-            $global:hasError = $true
-        }
-    }
-}
-
-if ($global:hasError) {
-    Write-Error "Imodspec validation failed."
-    exit 1;
-}
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Api/Controllers/ConcurrencyController.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Api/Controllers/ConcurrencyController.cs
new file mode 100644
index 0000000000..599d0276ea
--- /dev/null
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Api/Controllers/ConcurrencyController.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using AdvancedMappingCrud.Cosmos.Tests.Application.Concurrency.UpdateEntityAfterEtagWasChangedByPreviousOperationTest;
+using Intent.RoslynWeaver.Attributes;
+using MediatR;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.DependencyInjection;
+
+[assembly: DefaultIntentManaged(Mode.Fully)]
+[assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
+[assembly: IntentTemplate("Intent.AspNetCore.Controllers.Controller", Version = "1.0")]
+
+namespace AdvancedMappingCrud.Cosmos.Tests.Api.Controllers
+{
+    [ApiController]
+    public class ConcurrencyController : ControllerBase
+    {
+        private readonly ISender _mediator;
+
+        public ConcurrencyController(ISender mediator)
+        {
+            _mediator = mediator ?? throw new ArgumentNullException(nameof(mediator));
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <response code="204">Successfully updated.</response>
+        [HttpPut("api/concurrency-tests")]
+        [ProducesResponseType(StatusCodes.Status204NoContent)]
+        [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult> UpdateEntityAfterEtagWasChangedByPreviousOperationTest(CancellationToken cancellationToken = default)
+        {
+            await _mediator.Send(new UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand(), cancellationToken);
+            return NoContent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Api/Filters/ExceptionFilter.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Api/Filters/ExceptionFilter.cs
index 483687563c..f17e0b24ab 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Api/Filters/ExceptionFilter.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Api/Filters/ExceptionFilter.cs
@@ -6,6 +6,7 @@
 using Intent.RoslynWeaver.Attributes;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.Azure.Cosmos;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
 [assembly: IntentTemplate("Intent.AspNetCore.Controllers.ExceptionFilter", Version = "1.0")]
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Application/Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTest/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Application/Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTest/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand.cs
new file mode 100644
index 0000000000..fce93ea2db
--- /dev/null
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Application/Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTest/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand.cs
@@ -0,0 +1,16 @@
+using AdvancedMappingCrud.Cosmos.Tests.Application.Common.Interfaces;
+using Intent.RoslynWeaver.Attributes;
+using MediatR;
+
+[assembly: DefaultIntentManaged(Mode.Fully)]
+[assembly: IntentTemplate("Intent.Application.MediatR.CommandModels", Version = "1.0")]
+
+namespace AdvancedMappingCrud.Cosmos.Tests.Application.Concurrency.UpdateEntityAfterEtagWasChangedByPreviousOperationTest
+{
+    public class UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand : IRequest, ICommand
+    {
+        public UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Application/Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTest/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommandHandler.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Application/Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTest/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommandHandler.cs
new file mode 100644
index 0000000000..69a0af17a5
--- /dev/null
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Application/Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTest/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommandHandler.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using AdvancedMappingCrud.Cosmos.Tests.Domain;
+using AdvancedMappingCrud.Cosmos.Tests.Domain.Common.Exceptions;
+using AdvancedMappingCrud.Cosmos.Tests.Domain.Entities;
+using AdvancedMappingCrud.Cosmos.Tests.Domain.Repositories;
+using Intent.RoslynWeaver.Attributes;
+using MediatR;
+
+[assembly: DefaultIntentManaged(Mode.Fully)]
+[assembly: IntentTemplate("Intent.Application.MediatR.CommandHandler", Version = "2.0")]
+
+namespace AdvancedMappingCrud.Cosmos.Tests.Application.Concurrency.UpdateEntityAfterEtagWasChangedByPreviousOperationTest
+{
+    [IntentManaged(Mode.Merge, Signature = Mode.Fully)]
+    public class UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommandHandler : IRequestHandler<UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand>
+    {
+        private readonly ICustomerRepository _customerRepository;
+
+        [IntentManaged(Mode.Merge)]
+        public UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommandHandler(ICustomerRepository customerRepository)
+        {
+            _customerRepository = customerRepository;
+        }
+
+        [IntentManaged(Mode.Fully, Body = Mode.Ignore)]
+        public async Task Handle(
+            UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand request,
+            CancellationToken cancellationToken)
+        {
+            // Create a new customer
+
+            var customer = new Customer
+            {
+                Name = "John",
+                Surname = "Doe",
+                IsActive = true,
+                ShippingAddress = new Address(
+                    line1: "123 Street",
+                    line2: "Suburb",
+                    city: "City",
+                    postalCode: "0000"
+                )
+            };
+
+            _customerRepository.Add(customer);
+            await _customerRepository.UnitOfWork.SaveChangesAsync(cancellationToken);
+
+            // Read the two copies of the customer
+            var customerA = await _customerRepository.FindByIdAsync(customer.Id, cancellationToken);
+            if (customerA is null)
+            {
+                throw new NotFoundException($"Could not find CustomerA '{customer.Id}'");
+            }
+            var customerB = await _customerRepository.FindByIdAsync(customer.Id, cancellationToken);
+            if (customerB is null)
+            {
+                throw new NotFoundException($"Could not find CustomerB '{customer.Id}'");
+            }
+
+            // Change the first copy
+            customerA.Name = "Jane";
+            _customerRepository.Update(customerA);
+            await _customerRepository.UnitOfWork.SaveChangesAsync(cancellationToken);
+
+            // Change the second copy
+            // If Optimistic Concurrency is implemented correctly, this should throw an exception
+            customerB.Name = "John";
+            _customerRepository.Update(customerB);
+            await _customerRepository.UnitOfWork.SaveChangesAsync(cancellationToken);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/DeleteDiffId/DeleteDiffIdCommandValidator.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Application/Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTest/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommandValidator.cs
similarity index 51%
rename from Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/DeleteDiffId/DeleteDiffIdCommandValidator.cs
rename to Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Application/Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTest/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommandValidator.cs
index 724cb7fe03..0ba16f3968 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/DeleteDiffId/DeleteDiffIdCommandValidator.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Application/Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTest/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommandValidator.cs
@@ -4,12 +4,12 @@
 [assembly: DefaultIntentManaged(Mode.Fully)]
 [assembly: IntentTemplate("Intent.Application.MediatR.FluentValidation.CommandValidator", Version = "2.0")]
 
-namespace IntegrationTesting.Tests.Application.DiffIds.DeleteDiffId
+namespace AdvancedMappingCrud.Cosmos.Tests.Application.Concurrency.UpdateEntityAfterEtagWasChangedByPreviousOperationTest
 {
-    public class DeleteDiffIdCommandValidator : AbstractValidator<DeleteDiffIdCommand>
+    public class UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommandValidator : AbstractValidator<UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand>
     {
         [IntentManaged(Mode.Merge)]
-        public DeleteDiffIdCommandValidator()
+        public UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommandValidator()
         {
             ConfigureValidationRules();
         }
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/AdvancedMappingCrud.Cosmos.Tests.Infrastructure.csproj b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/AdvancedMappingCrud.Cosmos.Tests.Infrastructure.csproj
index e334928eda..4c7e241646 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/AdvancedMappingCrud.Cosmos.Tests.Infrastructure.csproj
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/AdvancedMappingCrud.Cosmos.Tests.Infrastructure.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IEvangelist.Azure.CosmosRepository" Version="3.7.0" />
+    <PackageReference Include="IEvangelist.Azure.CosmosRepository" Version="8.1.2" />
     <PackageReference Include="Intent.RoslynWeaver.Attributes" Version="2.1.4" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.0" />
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Persistence/Documents/CustomerDocument.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Persistence/Documents/CustomerDocument.cs
index fe589beeb4..5ce39b722b 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Persistence/Documents/CustomerDocument.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Persistence/Documents/CustomerDocument.cs
@@ -13,12 +13,15 @@ namespace AdvancedMappingCrud.Cosmos.Tests.Infrastructure.Persistence.Documents
     internal class CustomerDocument : ICustomerDocument, ICosmosDBDocument<Customer, CustomerDocument>
     {
         private string? _type;
+        [JsonProperty("_etag")]
+        private string? _etag;
         [JsonProperty("type")]
         string IItem.Type
         {
             get => _type ??= GetType().GetNameForDocument();
             set => _type = value;
         }
+        string? IItemWithEtag.Etag => _etag;
         public string Id { get; set; } = default!;
         public string Name { get; set; } = default!;
         public string Surname { get; set; } = default!;
@@ -39,7 +42,7 @@ public Customer ToEntity(Customer? entity = default)
             return entity;
         }
 
-        public CustomerDocument PopulateFromEntity(Customer entity)
+        public CustomerDocument PopulateFromEntity(Customer entity, string? etag = null)
         {
             Id = entity.Id;
             Name = entity.Name;
@@ -47,17 +50,19 @@ public CustomerDocument PopulateFromEntity(Customer entity)
             IsActive = entity.IsActive;
             ShippingAddress = AddressDocument.FromEntity(entity.ShippingAddress)!;
 
+            _etag = etag;
+
             return this;
         }
 
-        public static CustomerDocument? FromEntity(Customer? entity)
+        public static CustomerDocument? FromEntity(Customer? entity, string? etag = null)
         {
             if (entity is null)
             {
                 return null;
             }
 
-            return new CustomerDocument().PopulateFromEntity(entity);
+            return new CustomerDocument().PopulateFromEntity(entity, etag);
         }
     }
 }
\ No newline at end of file
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Persistence/Documents/ICosmosDBDocument.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Persistence/Documents/ICosmosDBDocument.cs
index 1d81c86e7e..f10ac7804e 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Persistence/Documents/ICosmosDBDocument.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Persistence/Documents/ICosmosDBDocument.cs
@@ -11,11 +11,11 @@ internal interface ICosmosDBDocument<TDomain, out TDocument> : ICosmosDBDocument
         where TDomain : class
         where TDocument : ICosmosDBDocument<TDomain, TDocument>
     {
-        TDocument PopulateFromEntity(TDomain entity);
+        TDocument PopulateFromEntity(TDomain entity, string? etag = null);
         TDomain ToEntity(TDomain? entity = null);
     }
 
-    internal interface ICosmosDBDocument : IItem
+    internal interface ICosmosDBDocument : IItemWithEtag
     {
         string IItem.PartitionKey => PartitionKey!;
         new string? PartitionKey
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Persistence/Documents/OrderDocument.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Persistence/Documents/OrderDocument.cs
index ec61e64648..f79eb6887f 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Persistence/Documents/OrderDocument.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Persistence/Documents/OrderDocument.cs
@@ -16,12 +16,15 @@ namespace AdvancedMappingCrud.Cosmos.Tests.Infrastructure.Persistence.Documents
     internal class OrderDocument : IOrderDocument, ICosmosDBDocument<Order, OrderDocument>
     {
         private string? _type;
+        [JsonProperty("_etag")]
+        private string? _etag;
         [JsonProperty("type")]
         string IItem.Type
         {
             get => _type ??= GetType().GetNameForDocument();
             set => _type = value;
         }
+        string? IItemWithEtag.Etag => _etag;
         public string Id { get; set; } = default!;
         public string CustomerId { get; set; } = default!;
         public string RefNo { get; set; } = default!;
@@ -47,7 +50,7 @@ public Order ToEntity(Order? entity = default)
             return entity;
         }
 
-        public OrderDocument PopulateFromEntity(Order entity)
+        public OrderDocument PopulateFromEntity(Order entity, string? etag = null)
         {
             Id = entity.Id;
             CustomerId = entity.CustomerId;
@@ -57,17 +60,19 @@ public OrderDocument PopulateFromEntity(Order entity)
             OrderItems = entity.OrderItems.Select(x => OrderItemDocument.FromEntity(x)!).ToList();
             OrderTags = entity.OrderTags.Select(x => OrderTagsDocument.FromEntity(x)!).ToList();
 
+            _etag = etag;
+
             return this;
         }
 
-        public static OrderDocument? FromEntity(Order? entity)
+        public static OrderDocument? FromEntity(Order? entity, string? etag = null)
         {
             if (entity is null)
             {
                 return null;
             }
 
-            return new OrderDocument().PopulateFromEntity(entity);
+            return new OrderDocument().PopulateFromEntity(entity, etag);
         }
     }
 }
\ No newline at end of file
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Persistence/Documents/ProductDocument.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Persistence/Documents/ProductDocument.cs
index 58ce65d262..cd148cc09b 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Persistence/Documents/ProductDocument.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Persistence/Documents/ProductDocument.cs
@@ -13,12 +13,15 @@ namespace AdvancedMappingCrud.Cosmos.Tests.Infrastructure.Persistence.Documents
     internal class ProductDocument : IProductDocument, ICosmosDBDocument<Product, ProductDocument>
     {
         private string? _type;
+        [JsonProperty("_etag")]
+        private string? _etag;
         [JsonProperty("type")]
         string IItem.Type
         {
             get => _type ??= GetType().GetNameForDocument();
             set => _type = value;
         }
+        string? IItemWithEtag.Etag => _etag;
         public string Id { get; set; } = default!;
         public string Name { get; set; } = default!;
 
@@ -32,22 +35,24 @@ public Product ToEntity(Product? entity = default)
             return entity;
         }
 
-        public ProductDocument PopulateFromEntity(Product entity)
+        public ProductDocument PopulateFromEntity(Product entity, string? etag = null)
         {
             Id = entity.Id;
             Name = entity.Name;
 
+            _etag = etag;
+
             return this;
         }
 
-        public static ProductDocument? FromEntity(Product? entity)
+        public static ProductDocument? FromEntity(Product? entity, string? etag = null)
         {
             if (entity is null)
             {
                 return null;
             }
 
-            return new ProductDocument().PopulateFromEntity(entity);
+            return new ProductDocument().PopulateFromEntity(entity, etag);
         }
     }
 }
\ No newline at end of file
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Repositories/CosmosDBRepositoryBase.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
index e3b05d2c9a..4179daeea4 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
@@ -22,6 +22,7 @@ internal abstract class CosmosDBRepositoryBase<TDomain, TDocument, TDocumentInte
         where TDomain : class
         where TDocument : ICosmosDBDocument<TDomain, TDocument>, TDocumentInterface, new()
     {
+        private Dictionary<string, string?> _etags;
         private readonly CosmosDBUnitOfWork _unitOfWork;
         private readonly Microsoft.Azure.CosmosRepository.IRepository<TDocument> _cosmosRepository;
         private readonly string _idFieldName;
@@ -33,10 +34,13 @@ protected CosmosDBRepositoryBase(CosmosDBUnitOfWork unitOfWork,
             _unitOfWork = unitOfWork;
             _cosmosRepository = cosmosRepository;
             _idFieldName = idFieldName;
+            _etags = new Dictionary<string, string?>();
         }
 
         public ICosmosDBUnitOfWork UnitOfWork => _unitOfWork;
 
+        public abstract string GetId(TDomain entity);
+
         public void Add(TDomain entity)
         {
             _unitOfWork.Track(entity);
@@ -51,7 +55,7 @@ public void Update(TDomain entity)
         {
             _unitOfWork.Enqueue(async cancellationToken =>
             {
-                var document = new TDocument().PopulateFromEntity(entity);
+                var document = new TDocument().PopulateFromEntity(entity, GetEtag(entity));
                 await _cosmosRepository.UpdateAsync(document, cancellationToken: cancellationToken);
             });
         }
@@ -60,7 +64,7 @@ public void Remove(TDomain entity)
         {
             _unitOfWork.Enqueue(async cancellationToken =>
             {
-                var document = new TDocument().PopulateFromEntity(entity);
+                var document = new TDocument().PopulateFromEntity(entity, GetEtag(entity));
                 await _cosmosRepository.DeleteAsync(document, cancellationToken: cancellationToken);
             });
         }
@@ -68,8 +72,7 @@ public void Remove(TDomain entity)
         public async Task<List<TDomain>> FindAllAsync(CancellationToken cancellationToken = default)
         {
             var documents = await _cosmosRepository.GetAsync(_ => true, cancellationToken);
-            var results = documents.Select(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -82,8 +85,7 @@ public async Task<List<TDomain>> FindAllAsync(CancellationToken cancellationToke
             try
             {
                 var document = await _cosmosRepository.GetAsync(id, partitionKey, cancellationToken: cancellationToken);
-                var entity = document.ToEntity();
-                Track(entity);
+                var entity = LoadAndTrackDocument(document);
 
                 return entity;
             }
@@ -98,8 +100,7 @@ public virtual async Task<List<TDomain>> FindAllAsync(
             CancellationToken cancellationToken = default)
         {
             var documents = await _cosmosRepository.GetAsync(AdaptFilterPredicate(filterExpression), cancellationToken);
-            var results = documents.Select(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -119,9 +120,12 @@ public virtual async Task<IPagedList<TDomain>> FindAllAsync(
             CancellationToken cancellationToken = default)
         {
             var pagedDocuments = await _cosmosRepository.PageAsync(AdaptFilterPredicate(filterExpression), pageNo, pageSize, true, cancellationToken);
-            Track(pagedDocuments.Items.Select(document => document.ToEntity()));
+            var entities = LoadAndTrackDocuments(pagedDocuments.Items).ToList();
+
+            var totalCount = pagedDocuments.Total ?? 0;
+            var pageCount = pagedDocuments.TotalPages ?? 0;
 
-            return new CosmosPagedList<TDomain, TDocument>(pagedDocuments, pageNo, pageSize);
+            return new CosmosPagedList<TDomain, TDocument>(entities, totalCount, pageCount, pageNo, pageSize);
         }
 
         public async Task<List<TDomain>> FindByIdsAsync(
@@ -131,8 +135,7 @@ public async Task<List<TDomain>> FindByIdsAsync(
             var queryDefinition = new QueryDefinition($"SELECT * from c WHERE ARRAY_CONTAINS(@ids, c.{_idFieldName})")
                 .WithParameter("@ids", ids);
             var documents = await _cosmosRepository.GetByQueryAsync(queryDefinition, cancellationToken);
-            var results = documents.Select(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -148,17 +151,32 @@ private static Expression<Func<TDocument, bool>> AdaptFilterPredicate(Expression
             return Expression.Lambda<Func<TDocument, bool>>(visitor.Visit(expression.Body)!, afterParameter);
         }
 
-        public void Track(IEnumerable<TDomain> items)
+        public TDomain LoadAndTrackDocument(TDocument document)
         {
-            foreach (var item in items)
+            var entity = document.ToEntity();
+
+            _unitOfWork.Track(entity);
+            _etags[document.Id] = document.Etag;
+
+            return entity;
+        }
+
+        public IEnumerable<TDomain> LoadAndTrackDocuments(IEnumerable<TDocument> documents)
+        {
+            foreach (var document in documents)
             {
-                _unitOfWork.Track(item);
+                yield return LoadAndTrackDocument(document);
             }
         }
 
-        public void Track(TDomain item)
+        public string? GetEtag(TDomain entity)
         {
-            _unitOfWork.Track(item);
+            if (_etags.TryGetValue(GetId(entity), out var etag))
+            {
+                return etag;
+            }
+
+            return default;
         }
 
         private class SubstitutionExpressionVisitor : ExpressionVisitor
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Repositories/CosmosPagedList.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Repositories/CosmosPagedList.cs
index b1258f89b2..b45fc809ac 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Repositories/CosmosPagedList.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Repositories/CosmosPagedList.cs
@@ -14,16 +14,16 @@ internal class CosmosPagedList<TDomain, TDocument> : List<TDomain>, IPagedList<T
         where TDomain : class
         where TDocument : ICosmosDBDocument<TDomain, TDocument>
     {
-        public CosmosPagedList(IPageQueryResult<TDocument> pagedResult, int pageNo, int pageSize)
+        public CosmosPagedList(IEnumerable<TDomain> pagedResult, int totalCount, int pageCount, int pageNo, int pageSize)
         {
-            TotalCount = pagedResult.Total ?? 0;
-            PageCount = pagedResult.TotalPages ?? 0;
+            TotalCount = totalCount;
+            PageCount = pageCount;
             PageNo = pageNo;
             PageSize = pageSize;
 
-            foreach (var result in pagedResult.Items)
+            foreach (var result in pagedResult)
             {
-                Add(result.ToEntity());
+                Add(result);
             }
         }
 
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Repositories/CustomerCosmosDBRepository.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Repositories/CustomerCosmosDBRepository.cs
index 546c48eadb..dccbc6f8fa 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Repositories/CustomerCosmosDBRepository.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Repositories/CustomerCosmosDBRepository.cs
@@ -21,5 +21,7 @@ public CustomerCosmosDBRepository(CosmosDBUnitOfWork unitOfWork,
         }
 
         public async Task<Customer?> FindByIdAsync(string id, CancellationToken cancellationToken = default) => await base.FindByIdAsync(id: id, cancellationToken: cancellationToken);
+
+        public override string GetId(Customer entity) => entity.Id;
     }
 }
\ No newline at end of file
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Repositories/OrderCosmosDBRepository.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Repositories/OrderCosmosDBRepository.cs
index ee4e205739..4c9e06c9b2 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Repositories/OrderCosmosDBRepository.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Repositories/OrderCosmosDBRepository.cs
@@ -21,5 +21,7 @@ public OrderCosmosDBRepository(CosmosDBUnitOfWork unitOfWork,
         }
 
         public async Task<Order?> FindByIdAsync(string id, CancellationToken cancellationToken = default) => await base.FindByIdAsync(id: id, cancellationToken: cancellationToken);
+
+        public override string GetId(Order entity) => entity.Id;
     }
 }
\ No newline at end of file
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Repositories/ProductCosmosDBRepository.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Repositories/ProductCosmosDBRepository.cs
index 031c5272b7..32a6ef2d4e 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Repositories/ProductCosmosDBRepository.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.Infrastructure/Repositories/ProductCosmosDBRepository.cs
@@ -21,5 +21,7 @@ public ProductCosmosDBRepository(CosmosDBUnitOfWork unitOfWork,
         }
 
         public async Task<Product?> FindByIdAsync(string id, CancellationToken cancellationToken = default) => await base.FindByIdAsync(id: id, cancellationToken: cancellationToken);
+
+        public override string GetId(Product entity) => entity.Id;
     }
 }
\ No newline at end of file
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.csproj b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.csproj
index 9911c6d145..f58dbb0b50 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.csproj
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.csproj
@@ -15,7 +15,7 @@
     <PackageReference Include="Intent.RoslynWeaver.Attributes" Version="2.1.4" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
     <PackageReference Include="Testcontainers.CosmosDb" Version="3.7.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/ConcurrencyHttpClient.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/ConcurrencyHttpClient.cs
new file mode 100644
index 0000000000..c6eb49eb68
--- /dev/null
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/ConcurrencyHttpClient.cs
@@ -0,0 +1,45 @@
+using System.Net.Http.Headers;
+using System.Text;
+using System.Text.Json;
+using Intent.RoslynWeaver.Attributes;
+
+[assembly: DefaultIntentManaged(Mode.Fully)]
+[assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
+[assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.HttpClient", Version = "2.0")]
+
+namespace AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients
+{
+    public class ConcurrencyHttpClient : IConcurrencyService
+    {
+        private readonly JsonSerializerOptions _serializerOptions;
+        private readonly HttpClient _httpClient;
+
+        public ConcurrencyHttpClient(HttpClient httpClient)
+        {
+            _httpClient = httpClient;
+            _serializerOptions = new JsonSerializerOptions
+            {
+                PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+            };
+        }
+
+        public async Task UpdateEntityAfterEtagWasChangedByPreviousOperationTestAsync(CancellationToken cancellationToken = default)
+        {
+            var relativeUri = $"api/concurrency-tests";
+            var httpRequest = new HttpRequestMessage(HttpMethod.Put, relativeUri);
+            httpRequest.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+            using (var response = await _httpClient.SendAsync(httpRequest, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false))
+            {
+                if (!response.IsSuccessStatusCode)
+                {
+                    throw await HttpClientRequestException.Create(_httpClient.BaseAddress!, httpRequest, response, cancellationToken).ConfigureAwait(false);
+                }
+            }
+        }
+
+        public void Dispose()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Customers/CustomersHttpClient.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/CustomersHttpClient.cs
similarity index 99%
rename from Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Customers/CustomersHttpClient.cs
rename to Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/CustomersHttpClient.cs
index ca6a8ca2af..f25399a1ce 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Customers/CustomersHttpClient.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/CustomersHttpClient.cs
@@ -8,7 +8,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.HttpClient", Version = "2.0")]
 
-namespace AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Customers
+namespace AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients
 {
     public class CustomersHttpClient : ICustomersService
     {
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/IConcurrencyService.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/IConcurrencyService.cs
new file mode 100644
index 0000000000..5e6b6249c4
--- /dev/null
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/IConcurrencyService.cs
@@ -0,0 +1,13 @@
+using Intent.RoslynWeaver.Attributes;
+
+[assembly: DefaultIntentManaged(Mode.Fully)]
+[assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
+[assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ProxyServiceContract", Version = "1.0")]
+
+namespace AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients
+{
+    public interface IConcurrencyService : IDisposable
+    {
+        Task UpdateEntityAfterEtagWasChangedByPreviousOperationTestAsync(CancellationToken cancellationToken = default);
+    }
+}
\ No newline at end of file
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Customers/ICustomersService.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/ICustomersService.cs
similarity index 98%
rename from Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Customers/ICustomersService.cs
rename to Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/ICustomersService.cs
index 96e0c09bc0..05a5af0d3b 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Customers/ICustomersService.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/ICustomersService.cs
@@ -5,7 +5,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ProxyServiceContract", Version = "1.0")]
 
-namespace AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Customers
+namespace AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients
 {
     public interface ICustomersService : IDisposable
     {
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Orders/IOrdersService.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/IOrdersService.cs
similarity index 99%
rename from Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Orders/IOrdersService.cs
rename to Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/IOrdersService.cs
index 3ef97e6eab..333a2a965d 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Orders/IOrdersService.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/IOrdersService.cs
@@ -5,7 +5,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ProxyServiceContract", Version = "1.0")]
 
-namespace AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Orders
+namespace AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients
 {
     public interface IOrdersService : IDisposable
     {
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Products/IProductsService.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/IProductsService.cs
similarity index 98%
rename from Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Products/IProductsService.cs
rename to Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/IProductsService.cs
index 155e9a2c96..5c679f9ab0 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Products/IProductsService.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/IProductsService.cs
@@ -5,7 +5,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ProxyServiceContract", Version = "1.0")]
 
-namespace AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Products
+namespace AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients
 {
     public interface IProductsService : IDisposable
     {
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Orders/OrdersHttpClient.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/OrdersHttpClient.cs
similarity index 99%
rename from Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Orders/OrdersHttpClient.cs
rename to Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/OrdersHttpClient.cs
index 509461b933..21b4479ce8 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Orders/OrdersHttpClient.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/OrdersHttpClient.cs
@@ -9,7 +9,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.HttpClient", Version = "2.0")]
 
-namespace AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Orders
+namespace AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients
 {
     public class OrdersHttpClient : IOrdersService
     {
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Products/ProductsHttpClient.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/ProductsHttpClient.cs
similarity index 99%
rename from Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Products/ProductsHttpClient.cs
rename to Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/ProductsHttpClient.cs
index 26484c5269..71029769b3 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Products/ProductsHttpClient.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/ProductsHttpClient.cs
@@ -8,7 +8,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.HttpClient", Version = "2.0")]
 
-namespace AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Products
+namespace AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients
 {
     public class ProductsHttpClient : IProductsService
     {
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Services/Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Services/Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand.cs
new file mode 100644
index 0000000000..982ec714ba
--- /dev/null
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Services/Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand.cs
@@ -0,0 +1,18 @@
+using Intent.RoslynWeaver.Attributes;
+
+[assembly: DefaultIntentManaged(Mode.Fully)]
+[assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
+[assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.DtoContract", Version = "2.0")]
+
+namespace AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.Services.Concurrency
+{
+    public class UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand
+    {
+        public static UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand Create()
+        {
+            return new UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand
+            {
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/TestDataFactory.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/TestDataFactory.cs
index a11eef5bea..902447ce1a 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/TestDataFactory.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/TestDataFactory.cs
@@ -1,7 +1,4 @@
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Customers;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Orders;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Products;
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.Services.Customers;
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.Services.Orders;
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.Services.Products;
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTestTests.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTestTests.cs
new file mode 100644
index 0000000000..1e19b7d754
--- /dev/null
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTestTests.cs
@@ -0,0 +1,33 @@
+using System.Net;
+using AdvancedMappingCrud.Cosmos.Tests.Domain.Entities;
+using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
+using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.Services.Concurrency;
+using Intent.RoslynWeaver.Attributes;
+
+[assembly: DefaultIntentManaged(Mode.Fully)]
+[assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ServiceEndpointTest", Version = "1.0")]
+
+namespace AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.Tests
+{
+    [IntentManaged(Mode.Merge, Signature = Mode.Fully)]
+    [Collection("SharedContainer")]
+    public class UpdateEntityAfterEtagWasChangedByPreviousOperationTestTests : BaseIntegrationTest
+    {
+        public UpdateEntityAfterEtagWasChangedByPreviousOperationTestTests(IntegrationTestWebAppFactory factory) : base(factory)
+        {
+        }
+
+        [Fact]
+        public async Task UpdateEntityAfterEtagWasChangedByPreviousOperationTest_ShouldFailWithConflict()
+        {
+            //Arrange
+            var client = new ConcurrencyHttpClient(CreateClient());
+
+            //Act
+
+            //Assert
+            var exception = await Assert.ThrowsAsync<HttpClientRequestException>(async () => await client.UpdateEntityAfterEtagWasChangedByPreviousOperationTestAsync());
+            Assert.Equal(HttpStatusCode.InternalServerError, exception.StatusCode);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Customers/CreateCustomerTests.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Customers/CreateCustomerTests.cs
index 3389f10408..82330b302a 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Customers/CreateCustomerTests.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Customers/CreateCustomerTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Customers;
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.Services.Customers;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
@@ -17,12 +16,7 @@ public CreateCustomerTests(IntegrationTestWebAppFactory factory) : base(factory)
         {
         }
 
-        /// <summary>
-        /// The Cosmos DB Linux Emulator Docker image does not run on Microsoft's CI environment (GitHub, Azure DevOps).")] // https://github.com/Azure/azure-cosmos-db-emulator-docker/issues/45.
-        /// Filter this test out of your CI/CD if appropriate e.g. dotnet test --filter Category!=ExcludeOnCI
-        /// </summary>
         [Fact]
-        [Trait("Category", "ExcludeOnCI")]
         public async Task CreateCustomer_ShouldCreateCustomer()
         {
             //Arrange
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Customers/DeleteCustomerTests.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Customers/DeleteCustomerTests.cs
index c7f9265e08..4a55ae9dbf 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Customers/DeleteCustomerTests.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Customers/DeleteCustomerTests.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Customers;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
@@ -17,12 +16,7 @@ public DeleteCustomerTests(IntegrationTestWebAppFactory factory) : base(factory)
         {
         }
 
-        /// <summary>
-        /// The Cosmos DB Linux Emulator Docker image does not run on Microsoft's CI environment (GitHub, Azure DevOps).")] // https://github.com/Azure/azure-cosmos-db-emulator-docker/issues/45.
-        /// Filter this test out of your CI/CD if appropriate e.g. dotnet test --filter Category!=ExcludeOnCI
-        /// </summary>
         [Fact]
-        [Trait("Category", "ExcludeOnCI")]
         public async Task DeleteCustomer_ShouldDeleteCustomer()
         {
             //Arrange
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Customers/GetCustomerByIdTests.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Customers/GetCustomerByIdTests.cs
index 8d9b83c2ce..11a1eaf721 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Customers/GetCustomerByIdTests.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Customers/GetCustomerByIdTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Customers;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
@@ -16,12 +15,7 @@ public GetCustomerByIdTests(IntegrationTestWebAppFactory factory) : base(factory
         {
         }
 
-        /// <summary>
-        /// The Cosmos DB Linux Emulator Docker image does not run on Microsoft's CI environment (GitHub, Azure DevOps).")] // https://github.com/Azure/azure-cosmos-db-emulator-docker/issues/45.
-        /// Filter this test out of your CI/CD if appropriate e.g. dotnet test --filter Category!=ExcludeOnCI
-        /// </summary>
         [Fact]
-        [Trait("Category", "ExcludeOnCI")]
         public async Task GetCustomerById_ShouldGetCustomerById()
         {
             //Arrange
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Customers/GetCustomersTests.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Customers/GetCustomersTests.cs
index 1f4879c7a8..50c83a58a9 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Customers/GetCustomersTests.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Customers/GetCustomersTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Customers;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
@@ -16,12 +15,7 @@ public GetCustomersTests(IntegrationTestWebAppFactory factory) : base(factory)
         {
         }
 
-        /// <summary>
-        /// The Cosmos DB Linux Emulator Docker image does not run on Microsoft's CI environment (GitHub, Azure DevOps).")] // https://github.com/Azure/azure-cosmos-db-emulator-docker/issues/45.
-        /// Filter this test out of your CI/CD if appropriate e.g. dotnet test --filter Category!=ExcludeOnCI
-        /// </summary>
         [Fact]
-        [Trait("Category", "ExcludeOnCI")]
         public async Task GetCustomers_ShouldGetCustomers()
         {
             //Arrange
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Customers/UpdateCustomerTests.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Customers/UpdateCustomerTests.cs
index e84d86cce9..7df0e6c140 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Customers/UpdateCustomerTests.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Customers/UpdateCustomerTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Customers;
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.Services.Customers;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
@@ -17,12 +16,7 @@ public UpdateCustomerTests(IntegrationTestWebAppFactory factory) : base(factory)
         {
         }
 
-        /// <summary>
-        /// The Cosmos DB Linux Emulator Docker image does not run on Microsoft's CI environment (GitHub, Azure DevOps).")] // https://github.com/Azure/azure-cosmos-db-emulator-docker/issues/45.
-        /// Filter this test out of your CI/CD if appropriate e.g. dotnet test --filter Category!=ExcludeOnCI
-        /// </summary>
         [Fact]
-        [Trait("Category", "ExcludeOnCI")]
         public async Task UpdateCustomer_ShouldUpdateCustomer()
         {
             //Arrange
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/CreateOrderOrderItemTests.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/CreateOrderOrderItemTests.cs
index 3cf11419e6..0e2124024e 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/CreateOrderOrderItemTests.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/CreateOrderOrderItemTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Orders;
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.Services.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
@@ -17,12 +16,7 @@ public CreateOrderOrderItemTests(IntegrationTestWebAppFactory factory) : base(fa
         {
         }
 
-        /// <summary>
-        /// The Cosmos DB Linux Emulator Docker image does not run on Microsoft's CI environment (GitHub, Azure DevOps).")] // https://github.com/Azure/azure-cosmos-db-emulator-docker/issues/45.
-        /// Filter this test out of your CI/CD if appropriate e.g. dotnet test --filter Category!=ExcludeOnCI
-        /// </summary>
         [Fact]
-        [Trait("Category", "ExcludeOnCI")]
         public async Task CreateOrderOrderItem_ShouldCreateOrderOrderItem()
         {
             //Arrange
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/CreateOrderTests.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/CreateOrderTests.cs
index ab6f5cefbc..eb3c3d7b0f 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/CreateOrderTests.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/CreateOrderTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Orders;
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.Services.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
@@ -17,12 +16,7 @@ public CreateOrderTests(IntegrationTestWebAppFactory factory) : base(factory)
         {
         }
 
-        /// <summary>
-        /// The Cosmos DB Linux Emulator Docker image does not run on Microsoft's CI environment (GitHub, Azure DevOps).")] // https://github.com/Azure/azure-cosmos-db-emulator-docker/issues/45.
-        /// Filter this test out of your CI/CD if appropriate e.g. dotnet test --filter Category!=ExcludeOnCI
-        /// </summary>
         [Fact]
-        [Trait("Category", "ExcludeOnCI")]
         public async Task CreateOrder_ShouldCreateOrder()
         {
             //Arrange
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/DeleteOrderOrderItemTests.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/DeleteOrderOrderItemTests.cs
index a7b4e6b75d..487a88963d 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/DeleteOrderOrderItemTests.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/DeleteOrderOrderItemTests.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
@@ -17,12 +16,7 @@ public DeleteOrderOrderItemTests(IntegrationTestWebAppFactory factory) : base(fa
         {
         }
 
-        /// <summary>
-        /// The Cosmos DB Linux Emulator Docker image does not run on Microsoft's CI environment (GitHub, Azure DevOps).")] // https://github.com/Azure/azure-cosmos-db-emulator-docker/issues/45.
-        /// Filter this test out of your CI/CD if appropriate e.g. dotnet test --filter Category!=ExcludeOnCI
-        /// </summary>
         [Fact]
-        [Trait("Category", "ExcludeOnCI")]
         public async Task DeleteOrderOrderItem_ShouldDeleteOrderOrderItem()
         {
             //Arrange
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/DeleteOrderTests.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/DeleteOrderTests.cs
index 235ddbc5e8..dc5d9d36b9 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/DeleteOrderTests.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/DeleteOrderTests.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
@@ -17,12 +16,7 @@ public DeleteOrderTests(IntegrationTestWebAppFactory factory) : base(factory)
         {
         }
 
-        /// <summary>
-        /// The Cosmos DB Linux Emulator Docker image does not run on Microsoft's CI environment (GitHub, Azure DevOps).")] // https://github.com/Azure/azure-cosmos-db-emulator-docker/issues/45.
-        /// Filter this test out of your CI/CD if appropriate e.g. dotnet test --filter Category!=ExcludeOnCI
-        /// </summary>
         [Fact]
-        [Trait("Category", "ExcludeOnCI")]
         public async Task DeleteOrder_ShouldDeleteOrder()
         {
             //Arrange
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/GetOrderByIdTests.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/GetOrderByIdTests.cs
index 491b1358f7..4688d12e99 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/GetOrderByIdTests.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/GetOrderByIdTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
@@ -16,12 +15,7 @@ public GetOrderByIdTests(IntegrationTestWebAppFactory factory) : base(factory)
         {
         }
 
-        /// <summary>
-        /// The Cosmos DB Linux Emulator Docker image does not run on Microsoft's CI environment (GitHub, Azure DevOps).")] // https://github.com/Azure/azure-cosmos-db-emulator-docker/issues/45.
-        /// Filter this test out of your CI/CD if appropriate e.g. dotnet test --filter Category!=ExcludeOnCI
-        /// </summary>
         [Fact]
-        [Trait("Category", "ExcludeOnCI")]
         public async Task GetOrderById_ShouldGetOrderById()
         {
             //Arrange
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemByIdTests.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemByIdTests.cs
index 969f439764..38ffa768d1 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemByIdTests.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemByIdTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
@@ -16,12 +15,7 @@ public GetOrderOrderItemByIdTests(IntegrationTestWebAppFactory factory) : base(f
         {
         }
 
-        /// <summary>
-        /// The Cosmos DB Linux Emulator Docker image does not run on Microsoft's CI environment (GitHub, Azure DevOps).")] // https://github.com/Azure/azure-cosmos-db-emulator-docker/issues/45.
-        /// Filter this test out of your CI/CD if appropriate e.g. dotnet test --filter Category!=ExcludeOnCI
-        /// </summary>
         [Fact]
-        [Trait("Category", "ExcludeOnCI")]
         public async Task GetOrderOrderItemById_ShouldGetOrderOrderItemById()
         {
             //Arrange
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemsTests.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemsTests.cs
index d39e4e0bfe..77c433352b 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemsTests.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemsTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
@@ -16,12 +15,7 @@ public GetOrderOrderItemsTests(IntegrationTestWebAppFactory factory) : base(fact
         {
         }
 
-        /// <summary>
-        /// The Cosmos DB Linux Emulator Docker image does not run on Microsoft's CI environment (GitHub, Azure DevOps).")] // https://github.com/Azure/azure-cosmos-db-emulator-docker/issues/45.
-        /// Filter this test out of your CI/CD if appropriate e.g. dotnet test --filter Category!=ExcludeOnCI
-        /// </summary>
         [Fact]
-        [Trait("Category", "ExcludeOnCI")]
         public async Task GetOrderOrderItems_ShouldGetOrderOrderItems()
         {
             //Arrange
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/GetOrdersTests.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/GetOrdersTests.cs
index 70c731fcf7..e5c30b9f22 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/GetOrdersTests.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/GetOrdersTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
@@ -16,12 +15,7 @@ public GetOrdersTests(IntegrationTestWebAppFactory factory) : base(factory)
         {
         }
 
-        /// <summary>
-        /// The Cosmos DB Linux Emulator Docker image does not run on Microsoft's CI environment (GitHub, Azure DevOps).")] // https://github.com/Azure/azure-cosmos-db-emulator-docker/issues/45.
-        /// Filter this test out of your CI/CD if appropriate e.g. dotnet test --filter Category!=ExcludeOnCI
-        /// </summary>
         [Fact]
-        [Trait("Category", "ExcludeOnCI")]
         public async Task GetOrders_ShouldGetOrders()
         {
             //Arrange
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/UpdateOrderOrderItemTests.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/UpdateOrderOrderItemTests.cs
index 7813241202..7043635324 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/UpdateOrderOrderItemTests.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/UpdateOrderOrderItemTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Orders;
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.Services.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
@@ -17,12 +16,7 @@ public UpdateOrderOrderItemTests(IntegrationTestWebAppFactory factory) : base(fa
         {
         }
 
-        /// <summary>
-        /// The Cosmos DB Linux Emulator Docker image does not run on Microsoft's CI environment (GitHub, Azure DevOps).")] // https://github.com/Azure/azure-cosmos-db-emulator-docker/issues/45.
-        /// Filter this test out of your CI/CD if appropriate e.g. dotnet test --filter Category!=ExcludeOnCI
-        /// </summary>
         [Fact]
-        [Trait("Category", "ExcludeOnCI")]
         public async Task UpdateOrderOrderItem_ShouldUpdateOrderOrderItem()
         {
             //Arrange
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/UpdateOrderTests.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/UpdateOrderTests.cs
index cdff59331c..671b306b8b 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/UpdateOrderTests.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Orders/UpdateOrderTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Orders;
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.Services.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
@@ -17,12 +16,7 @@ public UpdateOrderTests(IntegrationTestWebAppFactory factory) : base(factory)
         {
         }
 
-        /// <summary>
-        /// The Cosmos DB Linux Emulator Docker image does not run on Microsoft's CI environment (GitHub, Azure DevOps).")] // https://github.com/Azure/azure-cosmos-db-emulator-docker/issues/45.
-        /// Filter this test out of your CI/CD if appropriate e.g. dotnet test --filter Category!=ExcludeOnCI
-        /// </summary>
         [Fact]
-        [Trait("Category", "ExcludeOnCI")]
         public async Task UpdateOrder_ShouldUpdateOrder()
         {
             //Arrange
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Products/CreateProductTests.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Products/CreateProductTests.cs
index 6800d6496f..f31d32e7b1 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Products/CreateProductTests.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Products/CreateProductTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Products;
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.Services.Products;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
@@ -17,12 +16,7 @@ public CreateProductTests(IntegrationTestWebAppFactory factory) : base(factory)
         {
         }
 
-        /// <summary>
-        /// The Cosmos DB Linux Emulator Docker image does not run on Microsoft's CI environment (GitHub, Azure DevOps).")] // https://github.com/Azure/azure-cosmos-db-emulator-docker/issues/45.
-        /// Filter this test out of your CI/CD if appropriate e.g. dotnet test --filter Category!=ExcludeOnCI
-        /// </summary>
         [Fact]
-        [Trait("Category", "ExcludeOnCI")]
         public async Task CreateProduct_ShouldCreateProduct()
         {
             //Arrange
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Products/DeleteProductTests.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Products/DeleteProductTests.cs
index 58bbb44804..cb527f0578 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Products/DeleteProductTests.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Products/DeleteProductTests.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Products;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
@@ -17,12 +16,7 @@ public DeleteProductTests(IntegrationTestWebAppFactory factory) : base(factory)
         {
         }
 
-        /// <summary>
-        /// The Cosmos DB Linux Emulator Docker image does not run on Microsoft's CI environment (GitHub, Azure DevOps).")] // https://github.com/Azure/azure-cosmos-db-emulator-docker/issues/45.
-        /// Filter this test out of your CI/CD if appropriate e.g. dotnet test --filter Category!=ExcludeOnCI
-        /// </summary>
         [Fact]
-        [Trait("Category", "ExcludeOnCI")]
         public async Task DeleteProduct_ShouldDeleteProduct()
         {
             //Arrange
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Products/GetProductByIdTests.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Products/GetProductByIdTests.cs
index d24febb06c..7f850509d6 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Products/GetProductByIdTests.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Products/GetProductByIdTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Products;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
@@ -16,12 +15,7 @@ public GetProductByIdTests(IntegrationTestWebAppFactory factory) : base(factory)
         {
         }
 
-        /// <summary>
-        /// The Cosmos DB Linux Emulator Docker image does not run on Microsoft's CI environment (GitHub, Azure DevOps).")] // https://github.com/Azure/azure-cosmos-db-emulator-docker/issues/45.
-        /// Filter this test out of your CI/CD if appropriate e.g. dotnet test --filter Category!=ExcludeOnCI
-        /// </summary>
         [Fact]
-        [Trait("Category", "ExcludeOnCI")]
         public async Task GetProductById_ShouldGetProductById()
         {
             //Arrange
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Products/GetProductsTests.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Products/GetProductsTests.cs
index c9547de0c4..d2937aaed0 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Products/GetProductsTests.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Products/GetProductsTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Products;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
@@ -16,12 +15,7 @@ public GetProductsTests(IntegrationTestWebAppFactory factory) : base(factory)
         {
         }
 
-        /// <summary>
-        /// The Cosmos DB Linux Emulator Docker image does not run on Microsoft's CI environment (GitHub, Azure DevOps).")] // https://github.com/Azure/azure-cosmos-db-emulator-docker/issues/45.
-        /// Filter this test out of your CI/CD if appropriate e.g. dotnet test --filter Category!=ExcludeOnCI
-        /// </summary>
         [Fact]
-        [Trait("Category", "ExcludeOnCI")]
         public async Task GetProducts_ShouldGetProducts()
         {
             //Arrange
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Products/UpdateProductTests.cs b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Products/UpdateProductTests.cs
index 14c9a01257..18bb8bbd3e 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Products/UpdateProductTests.cs
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Products/UpdateProductTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.HttpClients.Products;
 using AdvancedMappingCrud.Cosmos.Tests.IntegrationTests.Services.Products;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
@@ -17,12 +16,7 @@ public UpdateProductTests(IntegrationTestWebAppFactory factory) : base(factory)
         {
         }
 
-        /// <summary>
-        /// The Cosmos DB Linux Emulator Docker image does not run on Microsoft's CI environment (GitHub, Azure DevOps).")] // https://github.com/Azure/azure-cosmos-db-emulator-docker/issues/45.
-        /// Filter this test out of your CI/CD if appropriate e.g. dotnet test --filter Category!=ExcludeOnCI
-        /// </summary>
         [Fact]
-        [Trait("Category", "ExcludeOnCI")]
         public async Task UpdateProduct_ShouldUpdateProduct()
         {
             //Arrange
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.application.config b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.application.config
index 5755a772d1..177ac563af 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.application.config
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.application.config
@@ -55,6 +55,18 @@
         </setting>
       </settings>
     </group>
+    <group id="e9f6758c-f8db-4cad-af33-827b867be548" title="CosmosDb">
+      <module>Intent.CosmosDB</module>
+      <icon type="UrlImagePath" source="data:image/png;base64,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" />
+      <settings>
+        <setting id="fcb114f7-77b4-4c6a-96c0-41bb146f4166" title="Use Optimistic Concurrency" module="Intent.CosmosDB" type="switch">
+          <hint>Ensures updates are applied only when document etags match, for improved concurrency management</hint>
+          <value>true</value>
+          <isRequired>true</isRequired>
+          <options />
+        </setting>
+      </settings>
+    </group>
     <group id="2392c046-0aa7-4ee5-a77a-e954c4a7aab5" title="CQRS Settings">
       <module>Intent.Application.MediatR</module>
       <icon type="UrlImagePath" source="data:image/png;base64,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" />
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.application.output.log b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.application.output.log
index 0bc60b015f..f45533c301 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.application.output.log
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/AdvancedMappingCrud.Cosmos.Tests.application.output.log
@@ -66,6 +66,14 @@
       <ProjectRelativeFilePath>SwashbuckleConfiguration.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
+    <FileLog>
+      <ProjectId>e936c843-fe11-41bc-8b71-66145063c8f6</ProjectId>
+      <CorrelationId>Intent.AspNetCore.Controllers.Controller#497fb8ac-3149-4afb-85c2-5d4b5327e010</CorrelationId>
+      <OverwriteBehaviour>always</OverwriteBehaviour>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.Api/Controllers/ConcurrencyController.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>ConcurrencyController.cs</ProjectRelativeFilePath>
+      <IsIgnored>false</IsIgnored>
+    </FileLog>
     <FileLog>
       <ProjectId>e936c843-fe11-41bc-8b71-66145063c8f6</ProjectId>
       <CorrelationId>Intent.AspNetCore.Controllers.Controller#a40b89e9-1e83-4f3a-8366-0068e9ea1958</CorrelationId>
@@ -330,6 +338,30 @@
       <ProjectRelativeFilePath>ValidatorProvider.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
+    <FileLog>
+      <ProjectId>ac728b60-fca0-4dd9-ba43-5bb11239aa88</ProjectId>
+      <CorrelationId>Intent.Application.MediatR.CommandModels#9bc9beb1-4166-430d-9fdc-d6a87a5e2271</CorrelationId>
+      <OverwriteBehaviour>always</OverwriteBehaviour>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.Application/Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTest/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTest/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand.cs</ProjectRelativeFilePath>
+      <IsIgnored>false</IsIgnored>
+    </FileLog>
+    <FileLog>
+      <ProjectId>ac728b60-fca0-4dd9-ba43-5bb11239aa88</ProjectId>
+      <CorrelationId>Intent.Application.MediatR.CommandHandler#9bc9beb1-4166-430d-9fdc-d6a87a5e2271</CorrelationId>
+      <OverwriteBehaviour>always</OverwriteBehaviour>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.Application/Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTest/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommandHandler.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTest/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommandHandler.cs</ProjectRelativeFilePath>
+      <IsIgnored>false</IsIgnored>
+    </FileLog>
+    <FileLog>
+      <ProjectId>ac728b60-fca0-4dd9-ba43-5bb11239aa88</ProjectId>
+      <CorrelationId>Intent.Application.MediatR.FluentValidation.CommandValidator#9bc9beb1-4166-430d-9fdc-d6a87a5e2271</CorrelationId>
+      <OverwriteBehaviour>always</OverwriteBehaviour>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.Application/Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTest/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommandValidator.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTest/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommandValidator.cs</ProjectRelativeFilePath>
+      <IsIgnored>false</IsIgnored>
+    </FileLog>
     <FileLog>
       <ProjectId>ac728b60-fca0-4dd9-ba43-5bb11239aa88</ProjectId>
       <CorrelationId>Intent.Application.MediatR.CommandModels#8d1b2d5e-92bb-4a86-b610-d7fbf94a937d</CorrelationId>
@@ -1364,18 +1396,18 @@
     </FileLog>
     <FileLog>
       <ProjectId>7dee352a-dfc5-4dff-9675-7e0773cea59c</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#a40b89e9-1e83-4f3a-8366-0068e9ea1958</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#497fb8ac-3149-4afb-85c2-5d4b5327e010</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Customers/CustomersHttpClient.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Customers/CustomersHttpClient.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/ConcurrencyHttpClient.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>ConcurrencyHttpClient.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>7dee352a-dfc5-4dff-9675-7e0773cea59c</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#a40b89e9-1e83-4f3a-8366-0068e9ea1958</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#a40b89e9-1e83-4f3a-8366-0068e9ea1958</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Customers/ICustomersService.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Customers/ICustomersService.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/CustomersHttpClient.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>CustomersHttpClient.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
@@ -1388,42 +1420,58 @@
     </FileLog>
     <FileLog>
       <ProjectId>7dee352a-dfc5-4dff-9675-7e0773cea59c</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.JsonResponse</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#497fb8ac-3149-4afb-85c2-5d4b5327e010</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/JsonResponse.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>JsonResponse.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/IConcurrencyService.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>IConcurrencyService.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>7dee352a-dfc5-4dff-9675-7e0773cea59c</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#c5c7590b-668d-4237-9ad4-a2df580080b2</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#a40b89e9-1e83-4f3a-8366-0068e9ea1958</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Orders/IOrdersService.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Orders/IOrdersService.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/ICustomersService.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>ICustomersService.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>7dee352a-dfc5-4dff-9675-7e0773cea59c</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#c5c7590b-668d-4237-9ad4-a2df580080b2</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#c5c7590b-668d-4237-9ad4-a2df580080b2</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Orders/OrdersHttpClient.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Orders/OrdersHttpClient.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/IOrdersService.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>IOrdersService.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>7dee352a-dfc5-4dff-9675-7e0773cea59c</ProjectId>
       <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#a8729734-3d09-4e83-86cb-220ac8910248</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Products/IProductsService.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Products/IProductsService.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/IProductsService.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>IProductsService.cs</ProjectRelativeFilePath>
+      <IsIgnored>false</IsIgnored>
+    </FileLog>
+    <FileLog>
+      <ProjectId>7dee352a-dfc5-4dff-9675-7e0773cea59c</ProjectId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.JsonResponse</CorrelationId>
+      <OverwriteBehaviour>always</OverwriteBehaviour>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/JsonResponse.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>JsonResponse.cs</ProjectRelativeFilePath>
+      <IsIgnored>false</IsIgnored>
+    </FileLog>
+    <FileLog>
+      <ProjectId>7dee352a-dfc5-4dff-9675-7e0773cea59c</ProjectId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#c5c7590b-668d-4237-9ad4-a2df580080b2</CorrelationId>
+      <OverwriteBehaviour>always</OverwriteBehaviour>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/OrdersHttpClient.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>OrdersHttpClient.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>7dee352a-dfc5-4dff-9675-7e0773cea59c</ProjectId>
       <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#a8729734-3d09-4e83-86cb-220ac8910248</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/Products/ProductsHttpClient.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Products/ProductsHttpClient.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/HttpClients/ProductsHttpClient.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>ProductsHttpClient.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
@@ -1450,6 +1498,14 @@
       <ProjectRelativeFilePath>PopulateIdsSpecimenBuilder.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
+    <FileLog>
+      <ProjectId>f6c2ba26-f45b-416d-9e71-86ab3a6b1be7</ProjectId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.DtoContract#9bc9beb1-4166-430d-9fdc-d6a87a5e2271</CorrelationId>
+      <OverwriteBehaviour>always</OverwriteBehaviour>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Services/Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>Services/Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand.cs</ProjectRelativeFilePath>
+      <IsIgnored>false</IsIgnored>
+    </FileLog>
     <FileLog>
       <ProjectId>f6c2ba26-f45b-416d-9e71-86ab3a6b1be7</ProjectId>
       <CorrelationId>Intent.AspNetCore.IntegrationTesting.DtoContract#8d1b2d5e-92bb-4a86-b610-d7fbf94a937d</CorrelationId>
@@ -1706,6 +1762,14 @@
       <ProjectRelativeFilePath>TestDataFactory.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
+    <FileLog>
+      <ProjectId>14bb1112-cfb0-43a4-b91d-ba28c73bd603</ProjectId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ServiceEndpointTest#9bc9beb1-4166-430d-9fdc-d6a87a5e2271</CorrelationId>
+      <OverwriteBehaviour>always</OverwriteBehaviour>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Cosmos.Tests.IntegrationTests/Tests/Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTestTests.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>Concurrency/UpdateEntityAfterEtagWasChangedByPreviousOperationTestTests.cs</ProjectRelativeFilePath>
+      <IsIgnored>false</IsIgnored>
+    </FileLog>
     <FileLog>
       <ProjectId>14bb1112-cfb0-43a4-b91d-ba28c73bd603</ProjectId>
       <CorrelationId>Intent.AspNetCore.IntegrationTesting.ServiceEndpointTest#8d1b2d5e-92bb-4a86-b610-d7fbf94a937d</CorrelationId>
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/Query/GetDiffIdsQuery__d2rx7n93.xml b/Tests/AdvancedMappingCrud.Cosmos.Tests/Intent.Metadata/Services/AdvancedMappingCrud.Cosmos.Tests.Services/Elements/Command/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand__d8tbl8y9.xml
similarity index 53%
rename from Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/Query/GetDiffIdsQuery__d2rx7n93.xml
rename to Tests/AdvancedMappingCrud.Cosmos.Tests/Intent.Metadata/Services/AdvancedMappingCrud.Cosmos.Tests.Services/Elements/Command/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand__d8tbl8y9.xml
index c247835f7e..4f396566e9 100644
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/Query/GetDiffIdsQuery__d2rx7n93.xml
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/Intent.Metadata/Services/AdvancedMappingCrud.Cosmos.Tests.Services/Elements/Command/UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand__d8tbl8y9.xml
@@ -1,38 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<class id="ee59ecae-170d-47a4-9a1f-07eba13d6eb4" type="Query" typeId="e71b0662-e29d-4db2-868b-8a12464b25d0">
-  <name>GetDiffIdsQuery</name>
-  <display>GetDiffIdsQuery: DiffIdDto[*]</display>
+<class id="9bc9beb1-4166-430d-9fdc-d6a87a5e2271" type="Command" typeId="ccf14eb6-3a55-4d81-b5b9-d27311c70cb9">
+  <name>UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand</name>
+  <display>UpdateEntityAfterEtagWasChangedByPreviousOperationTestCommand: void</display>
   <isAbstract>false</isAbstract>
   <genericTypes />
-  <typeReference id="a9bbafe3-b618-422e-9387-f2a041d2a4ba">
-    <typeId>73578a41-93f0-4ddb-b552-a7a035929378</typeId>
+  <typeReference id="99267ecb-0286-4a59-a96b-9bb3e858b23b">
     <isNavigable>true</isNavigable>
     <isNullable>false</isNullable>
-    <isCollection>true</isCollection>
+    <isCollection>false</isCollection>
     <isRequired>true</isRequired>
-    <typePackageName>IntegrationTesting.Tests.Services</typePackageName>
-    <typePackageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</typePackageId>
     <stereotypes />
     <genericTypeParameters />
   </typeReference>
   <isMapped>false</isMapped>
-  <parentFolderId>931bc22f-a0d8-43cd-9bdc-55eb2014eca4</parentFolderId>
-  <packageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</packageId>
-  <packageName>IntegrationTesting.Tests.Services</packageName>
+  <parentFolderId>497fb8ac-3149-4afb-85c2-5d4b5327e010</parentFolderId>
+  <packageId>d4ef5a60-8502-49fd-810c-bacd2efcf605</packageId>
+  <packageName>AdvancedMappingCrud.Cosmos.Tests.Services</packageName>
   <stereotypes>
     <stereotype stereotypeDefinitionId="b4581ed2-42ec-4ae2-83dd-dcdd5f0837b6" name="Http Settings">
       <addedByDefault>false</addedByDefault>
       <definitionPackageName>Intent.Metadata.WebApi</definitionPackageName>
       <definitionPackageId>0011387a-b122-45d7-9cdb-8e21b315ab9f</definitionPackageId>
       <properties>
-        <property name="801c3e61-4431-4d81-93fa-7e57d33cb3fa" display="Verb" value="GET" isActive="true" />
-        <property name="5dd3e07d-76eb-45d4-9956-4325fb068acc" display="Route" value="api/diff-id" isActive="true" />
+        <property name="801c3e61-4431-4d81-93fa-7e57d33cb3fa" display="Verb" value="PUT" isActive="true" />
+        <property name="5dd3e07d-76eb-45d4-9956-4325fb068acc" display="Route" value="api/concurrency-tests" isActive="true" />
         <property name="4490e212-1e99-43ce-b3dd-048ed2a6bae8" display="Return Type Mediatype" value="Default" isActive="true" />
       </properties>
     </stereotype>
   </stereotypes>
-  <metadata>
-    <entry key="baseName" value="DiffIds" />
-  </metadata>
+  <metadata />
   <childElements />
 </class>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/Folder/DiffIds__399z02ng.xml b/Tests/AdvancedMappingCrud.Cosmos.Tests/Intent.Metadata/Services/AdvancedMappingCrud.Cosmos.Tests.Services/Elements/Folder/Concurrency__cy1mbbr8.xml
similarity index 71%
rename from Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/Folder/DiffIds__399z02ng.xml
rename to Tests/AdvancedMappingCrud.Cosmos.Tests/Intent.Metadata/Services/AdvancedMappingCrud.Cosmos.Tests.Services/Elements/Folder/Concurrency__cy1mbbr8.xml
index e2406ee41f..d16a71b9a7 100644
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/Folder/DiffIds__399z02ng.xml
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/Intent.Metadata/Services/AdvancedMappingCrud.Cosmos.Tests.Services/Elements/Folder/Concurrency__cy1mbbr8.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<class id="931bc22f-a0d8-43cd-9bdc-55eb2014eca4" type="Folder" typeId="4d95d53a-8855-4f35-aa82-e312643f5c5f">
-  <name>DiffIds</name>
-  <display>DiffIds</display>
+<class id="497fb8ac-3149-4afb-85c2-5d4b5327e010" type="Folder" typeId="4d95d53a-8855-4f35-aa82-e312643f5c5f">
+  <name>Concurrency</name>
+  <display>Concurrency</display>
   <isAbstract>false</isAbstract>
   <sort-children>by-type-then-by-name</sort-children>
   <genericTypes />
   <isMapped>false</isMapped>
-  <parentFolderId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</parentFolderId>
-  <packageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</packageId>
-  <packageName>IntegrationTesting.Tests.Services</packageName>
+  <parentFolderId>d4ef5a60-8502-49fd-810c-bacd2efcf605</parentFolderId>
+  <packageId>d4ef5a60-8502-49fd-810c-bacd2efcf605</packageId>
+  <packageName>AdvancedMappingCrud.Cosmos.Tests.Services</packageName>
   <stereotypes>
     <stereotype stereotypeDefinitionId="66fd9e66-42c7-4ef9-a778-b68e009272b9" name="Folder Options">
       <addedByDefault>true</addedByDefault>
diff --git a/Tests/AdvancedMappingCrud.Cosmos.Tests/modules.config b/Tests/AdvancedMappingCrud.Cosmos.Tests/modules.config
index 552cdbe792..5827414e16 100644
--- a/Tests/AdvancedMappingCrud.Cosmos.Tests/modules.config
+++ b/Tests/AdvancedMappingCrud.Cosmos.Tests/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.Application.ServiceImplementations" version="4.5.1" />
@@ -20,17 +20,17 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.HealthChecks" version="2.0.2-pre.1" />
   <module moduleId="Intent.AspNetCore.IntegrationTesting" version="1.0.0-pre.2" />
-  <module moduleId="Intent.AspNetCore.IntegrationTests.CRUD" version="1.0.0-pre.4" />
+  <module moduleId="Intent.AspNetCore.IntegrationTests.CRUD" version="1.0.0-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
-  <module moduleId="Intent.CosmosDB" version="1.0.3" />
+  <module moduleId="Intent.CosmosDB" version="1.0.4-pre.0" />
   <module moduleId="Intent.DocumentDB.Dtos.AutoMapper" version="1.0.0" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -40,12 +40,12 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modelers.Types.ServiceProxies" version="5.2.2" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests.csproj b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests.csproj
index 76a4cbda43..ea7a3de83a 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests.csproj
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Intent.RoslynWeaver.Attributes" Version="2.1.4" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
     <PackageReference Include="Testcontainers.MsSql" Version="3.7.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Customers/CustomersHttpClient.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/CustomersHttpClient.cs
similarity index 99%
rename from Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Customers/CustomersHttpClient.cs
rename to Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/CustomersHttpClient.cs
index cbe8099c87..9c206c1457 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Customers/CustomersHttpClient.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/CustomersHttpClient.cs
@@ -8,7 +8,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.HttpClient", Version = "2.0")]
 
-namespace AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Customers
+namespace AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients
 {
     public class CustomersHttpClient : ICustomersService
     {
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Customers/ICustomersService.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/ICustomersService.cs
similarity index 97%
rename from Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Customers/ICustomersService.cs
rename to Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/ICustomersService.cs
index bf2ff28dc8..ca01065405 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Customers/ICustomersService.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/ICustomersService.cs
@@ -5,7 +5,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ProxyServiceContract", Version = "1.0")]
 
-namespace AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Customers
+namespace AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients
 {
     public interface ICustomersService : IDisposable
     {
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Orders/IOrdersService.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/IOrdersService.cs
similarity index 98%
rename from Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Orders/IOrdersService.cs
rename to Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/IOrdersService.cs
index dce163a89a..f2d5838567 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Orders/IOrdersService.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/IOrdersService.cs
@@ -5,7 +5,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ProxyServiceContract", Version = "1.0")]
 
-namespace AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Orders
+namespace AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients
 {
     public interface IOrdersService : IDisposable
     {
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Products/IProductsService.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/IProductsService.cs
similarity index 98%
rename from Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Products/IProductsService.cs
rename to Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/IProductsService.cs
index d533dd9705..fb52dc5b83 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Products/IProductsService.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/IProductsService.cs
@@ -6,7 +6,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ProxyServiceContract", Version = "1.0")]
 
-namespace AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Products
+namespace AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients
 {
     public interface IProductsService : IDisposable
     {
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Orders/OrdersHttpClient.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/OrdersHttpClient.cs
similarity index 99%
rename from Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Orders/OrdersHttpClient.cs
rename to Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/OrdersHttpClient.cs
index 38c4e66c09..ebad503702 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Orders/OrdersHttpClient.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/OrdersHttpClient.cs
@@ -8,7 +8,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.HttpClient", Version = "2.0")]
 
-namespace AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Orders
+namespace AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients
 {
     public class OrdersHttpClient : IOrdersService
     {
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Products/ProductsHttpClient.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/ProductsHttpClient.cs
similarity index 99%
rename from Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Products/ProductsHttpClient.cs
rename to Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/ProductsHttpClient.cs
index 0e621bd882..fdea88ba22 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Products/ProductsHttpClient.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/ProductsHttpClient.cs
@@ -10,7 +10,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.HttpClient", Version = "2.0")]
 
-namespace AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Products
+namespace AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients
 {
     public class ProductsHttpClient : IProductsService
     {
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/TestDataFactory.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/TestDataFactory.cs
index 1d3262090a..cdc5b6f6c9 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/TestDataFactory.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/TestDataFactory.cs
@@ -1,7 +1,4 @@
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Customers;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Orders;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Products;
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.Services.Customers;
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.Services.Orders;
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.Services.Products;
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Customers/CreateCustomerTests.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Customers/CreateCustomerTests.cs
index 2a149d5c55..fa9de4948e 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Customers/CreateCustomerTests.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Customers/CreateCustomerTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Customers;
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.Services.Customers;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Customers/DeleteCustomerTests.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Customers/DeleteCustomerTests.cs
index 5951a7a869..664abf0778 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Customers/DeleteCustomerTests.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Customers/DeleteCustomerTests.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Customers;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Customers/GetCustomerByIdTests.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Customers/GetCustomerByIdTests.cs
index a320d60a69..b816a62471 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Customers/GetCustomerByIdTests.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Customers/GetCustomerByIdTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Customers;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Customers/GetCustomersTests.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Customers/GetCustomersTests.cs
index 69ea7cd05b..6c3f36bab8 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Customers/GetCustomersTests.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Customers/GetCustomersTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Customers;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Customers/UpdateCustomerTests.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Customers/UpdateCustomerTests.cs
index 7929c7fe2e..911ec353d5 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Customers/UpdateCustomerTests.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Customers/UpdateCustomerTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Customers;
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.Services.Customers;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/CreateOrderOrderItemTests.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/CreateOrderOrderItemTests.cs
index 66567e82f9..ffc00cd82e 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/CreateOrderOrderItemTests.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/CreateOrderOrderItemTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Orders;
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.Services.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/CreateOrderTests.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/CreateOrderTests.cs
index 7dbd6566a2..e710c80b9e 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/CreateOrderTests.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/CreateOrderTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Orders;
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.Services.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/DeleteOrderOrderItemTests.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/DeleteOrderOrderItemTests.cs
index 50d87e3ae1..7be09b63d7 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/DeleteOrderOrderItemTests.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/DeleteOrderOrderItemTests.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/DeleteOrderTests.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/DeleteOrderTests.cs
index 30eaa4b5da..b09c6fa49f 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/DeleteOrderTests.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/DeleteOrderTests.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/GetOrderByIdTests.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/GetOrderByIdTests.cs
index d48e126924..1c39b3f0f3 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/GetOrderByIdTests.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/GetOrderByIdTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemByIdTests.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemByIdTests.cs
index ebb3296a0a..4f77f3b6d1 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemByIdTests.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemByIdTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemsTests.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemsTests.cs
index b580886916..a0ccae5ebf 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemsTests.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemsTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/GetOrdersTests.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/GetOrdersTests.cs
index 68cf2356a9..95dde9e8a8 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/GetOrdersTests.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/GetOrdersTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/UpdateOrderOrderItemTests.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/UpdateOrderOrderItemTests.cs
index e343e349af..eec1b4fdab 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/UpdateOrderOrderItemTests.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/UpdateOrderOrderItemTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Orders;
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.Services.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/UpdateOrderTests.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/UpdateOrderTests.cs
index dad28a220f..0549b368dd 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/UpdateOrderTests.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Orders/UpdateOrderTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Orders;
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.Services.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Products/CreateProductTests.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Products/CreateProductTests.cs
index 67138c0aaf..27235f4c85 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Products/CreateProductTests.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Products/CreateProductTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Products;
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.Services.Products;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Products/DeleteProductTests.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Products/DeleteProductTests.cs
index 71755d6f22..ff6511e628 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Products/DeleteProductTests.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Products/DeleteProductTests.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Products;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Products/GetProductByIdTests.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Products/GetProductByIdTests.cs
index b96fb7f2f7..5291348c46 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Products/GetProductByIdTests.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Products/GetProductByIdTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Products;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Products/GetProductsTests.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Products/GetProductsTests.cs
index 163030ba06..dbd87123db 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Products/GetProductsTests.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Products/GetProductsTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Products;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Products/UpdateProductTests.cs b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Products/UpdateProductTests.cs
index 0bd7ce57f4..e687efd290 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Products/UpdateProductTests.cs
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.IntegrationTests/Tests/Products/UpdateProductTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.HttpClients.Products;
 using AdvancedMappingCrud.DbContext.Tests.IntegrationTests.Services.Products;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.application.output.log b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.application.output.log
index 71e116492b..f9b4d3f1fc 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.application.output.log
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/AdvancedMappingCrud.DbContext.Tests.application.output.log
@@ -1142,64 +1142,64 @@
       <ProjectId>e7203cc8-e6af-4df9-a702-e6a994fe1544</ProjectId>
       <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#391bdd9e-55c1-4ccb-881c-981b364d8124</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Customers/CustomersHttpClient.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Customers/CustomersHttpClient.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/CustomersHttpClient.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>CustomersHttpClient.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>e7203cc8-e6af-4df9-a702-e6a994fe1544</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#391bdd9e-55c1-4ccb-881c-981b364d8124</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClientRequestException</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Customers/ICustomersService.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Customers/ICustomersService.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/HttpClientRequestException.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>HttpClientRequestException.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>e7203cc8-e6af-4df9-a702-e6a994fe1544</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClientRequestException</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#391bdd9e-55c1-4ccb-881c-981b364d8124</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/HttpClientRequestException.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>HttpClientRequestException.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/ICustomersService.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>ICustomersService.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>e7203cc8-e6af-4df9-a702-e6a994fe1544</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.JsonResponse</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#488aa1b9-6c0e-4b95-8618-784468d93831</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/JsonResponse.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>JsonResponse.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/IOrdersService.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>IOrdersService.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>e7203cc8-e6af-4df9-a702-e6a994fe1544</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#488aa1b9-6c0e-4b95-8618-784468d93831</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#2262014b-21f6-451e-b3a8-e942df338cc8</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Orders/IOrdersService.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Orders/IOrdersService.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/IProductsService.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>IProductsService.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>e7203cc8-e6af-4df9-a702-e6a994fe1544</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#488aa1b9-6c0e-4b95-8618-784468d93831</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.JsonResponse</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Orders/OrdersHttpClient.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Orders/OrdersHttpClient.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/JsonResponse.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>JsonResponse.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>e7203cc8-e6af-4df9-a702-e6a994fe1544</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#2262014b-21f6-451e-b3a8-e942df338cc8</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#488aa1b9-6c0e-4b95-8618-784468d93831</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Products/IProductsService.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Products/IProductsService.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/OrdersHttpClient.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>OrdersHttpClient.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>e7203cc8-e6af-4df9-a702-e6a994fe1544</ProjectId>
       <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#2262014b-21f6-451e-b3a8-e942df338cc8</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/Products/ProductsHttpClient.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Products/ProductsHttpClient.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.DbContext.Tests.IntegrationTests/HttpClients/ProductsHttpClient.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>ProductsHttpClient.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
diff --git a/Tests/AdvancedMappingCrud.DbContext.Tests/modules.config b/Tests/AdvancedMappingCrud.DbContext.Tests/modules.config
index dac62dc94b..d894bc2c3d 100644
--- a/Tests/AdvancedMappingCrud.DbContext.Tests/modules.config
+++ b/Tests/AdvancedMappingCrud.DbContext.Tests/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.Application.ServiceImplementations" version="4.5.1" />
@@ -20,15 +20,15 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.HealthChecks" version="2.0.2-pre.1" />
   <module moduleId="Intent.AspNetCore.IntegrationTesting" version="1.0.0-pre.2" />
-  <module moduleId="Intent.AspNetCore.IntegrationTests.CRUD" version="1.0.0-pre.4" />
+  <module moduleId="Intent.AspNetCore.IntegrationTests.CRUD" version="1.0.0-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -38,11 +38,11 @@
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.4-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modelers.Types.ServiceProxies" version="5.2.2" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.Infrastructure/AdvancedMappingCrud.Repositories.Tests.Infrastructure.csproj b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.Infrastructure/AdvancedMappingCrud.Repositories.Tests.Infrastructure.csproj
index ebbb270214..f654fa05aa 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.Infrastructure/AdvancedMappingCrud.Repositories.Tests.Infrastructure.csproj
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.Infrastructure/AdvancedMappingCrud.Repositories.Tests.Infrastructure.csproj
@@ -25,6 +25,6 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
   </ItemGroup>
   </Project>
\ No newline at end of file
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests.csproj b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests.csproj
index 4c82dfab1d..64e7feb13b 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests.csproj
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests.csproj
@@ -15,7 +15,7 @@
     <PackageReference Include="Intent.RoslynWeaver.Attributes" Version="2.1.4" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Customers/CustomersHttpClient.cs b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/CustomersHttpClient.cs
similarity index 99%
rename from Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Customers/CustomersHttpClient.cs
rename to Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/CustomersHttpClient.cs
index 1942abcadf..052a459c91 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Customers/CustomersHttpClient.cs
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/CustomersHttpClient.cs
@@ -10,7 +10,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.HttpClient", Version = "2.0")]
 
-namespace AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients.Customers
+namespace AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients
 {
     public class CustomersHttpClient : ICustomersService
     {
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Customers/ICustomersService.cs b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/ICustomersService.cs
similarity index 98%
rename from Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Customers/ICustomersService.cs
rename to Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/ICustomersService.cs
index 22dc0bafca..de8079f91b 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Customers/ICustomersService.cs
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/ICustomersService.cs
@@ -6,7 +6,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ProxyServiceContract", Version = "1.0")]
 
-namespace AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients.Customers
+namespace AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients
 {
     public interface ICustomersService : IDisposable
     {
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Orders/IOrdersService.cs b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/IOrdersService.cs
similarity index 98%
rename from Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Orders/IOrdersService.cs
rename to Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/IOrdersService.cs
index 2f4ed41dc9..5acdb80cc3 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Orders/IOrdersService.cs
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/IOrdersService.cs
@@ -6,7 +6,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ProxyServiceContract", Version = "1.0")]
 
-namespace AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients.Orders
+namespace AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients
 {
     public interface IOrdersService : IDisposable
     {
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Users/IUsersService.cs b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/IUsersService.cs
similarity index 98%
rename from Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Users/IUsersService.cs
rename to Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/IUsersService.cs
index 19bae31135..82a2530d3d 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Users/IUsersService.cs
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/IUsersService.cs
@@ -6,7 +6,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ProxyServiceContract", Version = "1.0")]
 
-namespace AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients.Users
+namespace AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients
 {
     public interface IUsersService : IDisposable
     {
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Orders/OrdersHttpClient.cs b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/OrdersHttpClient.cs
similarity index 99%
rename from Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Orders/OrdersHttpClient.cs
rename to Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/OrdersHttpClient.cs
index bae0382e3a..dce050a0da 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Orders/OrdersHttpClient.cs
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/OrdersHttpClient.cs
@@ -10,7 +10,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.HttpClient", Version = "2.0")]
 
-namespace AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients.Orders
+namespace AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients
 {
     public class OrdersHttpClient : IOrdersService
     {
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Users/UsersHttpClient.cs b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/UsersHttpClient.cs
similarity index 99%
rename from Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Users/UsersHttpClient.cs
rename to Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/UsersHttpClient.cs
index 7556136863..f81df4c9f4 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Users/UsersHttpClient.cs
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/UsersHttpClient.cs
@@ -10,7 +10,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.HttpClient", Version = "2.0")]
 
-namespace AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients.Users
+namespace AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients
 {
     public class UsersHttpClient : IUsersService
     {
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/TestDataFactory.cs b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/TestDataFactory.cs
index 02c5d6d5a3..a4deac3959 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/TestDataFactory.cs
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/TestDataFactory.cs
@@ -1,6 +1,4 @@
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients.Customers;
-using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients.Orders;
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.Services.Customers;
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.Services.Orders;
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.Services.Products;
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Customers/CreateCustomerTests.cs b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Customers/CreateCustomerTests.cs
index a39ec2781b..e89a7ad0ec 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Customers/CreateCustomerTests.cs
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Customers/CreateCustomerTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients.Customers;
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.Services.Customers;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Customers/DeleteCustomerTests.cs b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Customers/DeleteCustomerTests.cs
index 8b1bdbf151..4a598f1b8b 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Customers/DeleteCustomerTests.cs
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Customers/DeleteCustomerTests.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients.Customers;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Customers/GetCustomerByIdTests.cs b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Customers/GetCustomerByIdTests.cs
index 8ca591bd84..ce5d1e76fe 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Customers/GetCustomerByIdTests.cs
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Customers/GetCustomerByIdTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients.Customers;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Customers/UpdateCustomerTests.cs b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Customers/UpdateCustomerTests.cs
index 221234d2b9..babb3cc72c 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Customers/UpdateCustomerTests.cs
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Customers/UpdateCustomerTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients.Customers;
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.Services.Customers;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/CreateOrderOrderItemTests.cs b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/CreateOrderOrderItemTests.cs
index 13f505d428..4f593ae7cc 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/CreateOrderOrderItemTests.cs
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/CreateOrderOrderItemTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients.Orders;
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.Services.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/CreateOrderTests.cs b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/CreateOrderTests.cs
index 6907d8b899..6b4a65e5f9 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/CreateOrderTests.cs
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/CreateOrderTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients.Orders;
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.Services.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/DeleteOrderOrderItemTests.cs b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/DeleteOrderOrderItemTests.cs
index cae1372a89..60e366c600 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/DeleteOrderOrderItemTests.cs
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/DeleteOrderOrderItemTests.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/DeleteOrderTests.cs b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/DeleteOrderTests.cs
index c655def9bb..3b0a6eaa6b 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/DeleteOrderTests.cs
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/DeleteOrderTests.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/GetOrderByIdTests.cs b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/GetOrderByIdTests.cs
index 958f5f1eea..5b75e48229 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/GetOrderByIdTests.cs
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/GetOrderByIdTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemByIdTests.cs b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemByIdTests.cs
index 2e27f74535..8adace6d5c 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemByIdTests.cs
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemByIdTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemsTests.cs b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemsTests.cs
index d14cdb933f..45ba2cfe1d 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemsTests.cs
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemsTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/UpdateOrderOrderItemTests.cs b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/UpdateOrderOrderItemTests.cs
index 7ff7b868d5..bd749520ed 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/UpdateOrderOrderItemTests.cs
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/UpdateOrderOrderItemTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients.Orders;
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.Services.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/UpdateOrderTests.cs b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/UpdateOrderTests.cs
index 094c898985..9104567158 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/UpdateOrderTests.cs
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.IntegrationTests/Tests/Orders/UpdateOrderTests.cs
@@ -1,5 +1,4 @@
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients;
-using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.HttpClients.Orders;
 using AdvancedMappingCrud.Repositories.Tests.IntegrationTests.Services.Orders;
 using AutoFixture;
 using Intent.RoslynWeaver.Attributes;
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.application.output.log b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.application.output.log
index f39f143bc6..b916a18e0b 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.application.output.log
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/AdvancedMappingCrud.Repositories.Tests.application.output.log
@@ -2134,24 +2134,32 @@
       <ProjectId>48f936b0-25d5-4f2b-a48f-62f6ccbbedd9</ProjectId>
       <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#0fe46e70-fb75-41d7-afa5-10cb420de4ee</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Customers/CustomersHttpClient.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Customers/CustomersHttpClient.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/CustomersHttpClient.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>CustomersHttpClient.cs</ProjectRelativeFilePath>
+      <IsIgnored>false</IsIgnored>
+    </FileLog>
+    <FileLog>
+      <ProjectId>48f936b0-25d5-4f2b-a48f-62f6ccbbedd9</ProjectId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClientRequestException</CorrelationId>
+      <OverwriteBehaviour>always</OverwriteBehaviour>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/HttpClientRequestException.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>HttpClientRequestException.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>48f936b0-25d5-4f2b-a48f-62f6ccbbedd9</ProjectId>
       <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#0fe46e70-fb75-41d7-afa5-10cb420de4ee</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Customers/ICustomersService.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Customers/ICustomersService.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/ICustomersService.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>ICustomersService.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>48f936b0-25d5-4f2b-a48f-62f6ccbbedd9</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClientRequestException</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#7c027293-4dce-4d6d-9efa-1233565f5c1c</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/HttpClientRequestException.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>HttpClientRequestException.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/IOrdersService.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>IOrdersService.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
@@ -2164,26 +2172,26 @@
     </FileLog>
     <FileLog>
       <ProjectId>48f936b0-25d5-4f2b-a48f-62f6ccbbedd9</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.JsonResponse</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#a428c4c6-01f2-4b72-8dc1-54bde6bad58c</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/JsonResponse.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>JsonResponse.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/IUsersService.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>IUsersService.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>48f936b0-25d5-4f2b-a48f-62f6ccbbedd9</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#7c027293-4dce-4d6d-9efa-1233565f5c1c</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.JsonResponse</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Orders/IOrdersService.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Orders/IOrdersService.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/JsonResponse.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>JsonResponse.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>48f936b0-25d5-4f2b-a48f-62f6ccbbedd9</ProjectId>
       <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#7c027293-4dce-4d6d-9efa-1233565f5c1c</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Orders/OrdersHttpClient.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Orders/OrdersHttpClient.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/OrdersHttpClient.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>OrdersHttpClient.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
@@ -2194,20 +2202,12 @@
       <ProjectRelativeFilePath>ProductsServiceHttpClient.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
-    <FileLog>
-      <ProjectId>48f936b0-25d5-4f2b-a48f-62f6ccbbedd9</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#a428c4c6-01f2-4b72-8dc1-54bde6bad58c</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Users/IUsersService.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Users/IUsersService.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
     <FileLog>
       <ProjectId>48f936b0-25d5-4f2b-a48f-62f6ccbbedd9</ProjectId>
       <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#a428c4c6-01f2-4b72-8dc1-54bde6bad58c</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/Users/UsersHttpClient.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Users/UsersHttpClient.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>AdvancedMappingCrud.Repositories.Tests.IntegrationTests/HttpClients/UsersHttpClient.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>UsersHttpClient.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
diff --git a/Tests/AdvancedMappingCrud.Repositories.Tests/modules.config b/Tests/AdvancedMappingCrud.Repositories.Tests/modules.config
index 3bf7f9f357..494ecda9ed 100644
--- a/Tests/AdvancedMappingCrud.Repositories.Tests/modules.config
+++ b/Tests/AdvancedMappingCrud.Repositories.Tests/modules.config
@@ -13,7 +13,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.CRUD.Eventing" version="5.0.1" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
@@ -23,15 +23,15 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.HealthChecks" version="2.0.2-pre.1" />
   <module moduleId="Intent.AspNetCore.IntegrationTesting" version="1.0.0-pre.2" />
-  <module moduleId="Intent.AspNetCore.IntegrationTests.CRUD" version="1.0.0-pre.4" />
+  <module moduleId="Intent.AspNetCore.IntegrationTests.CRUD" version="1.0.0-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.DomainServices" version="1.1.3" />
@@ -42,24 +42,24 @@
   <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.5.0" />
   <module moduleId="Intent.Eventing.Contracts" version="5.0.3-pre.0" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.5-pre.1" />
-  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.5" />
+  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.4" />
   <module moduleId="Intent.Eventing.MassTransit.EntityFrameworkCore" version="5.1.0" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Integration.HttpClients" version="5.1.0-pre.1" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.4-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.Services" version="1.0.2" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.ServiceProxies" version="5.0.2" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Types.ServiceProxies" version="5.2.2" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
diff --git a/Tests/Application.Identity.AccountController.UserIdentity/modules.config b/Tests/Application.Identity.AccountController.UserIdentity/modules.config
index d3e74e047b..41bcbfbe45 100644
--- a/Tests/Application.Identity.AccountController.UserIdentity/modules.config
+++ b/Tests/Application.Identity.AccountController.UserIdentity/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -21,7 +21,7 @@
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
diff --git a/Tests/Application.Identity.AccountController/modules.config b/Tests/Application.Identity.AccountController/modules.config
index 99a0154201..3c69bc17eb 100644
--- a/Tests/Application.Identity.AccountController/modules.config
+++ b/Tests/Application.Identity.AccountController/modules.config
@@ -14,13 +14,13 @@
   <module moduleId="Intent.Application.ServiceImplementations.Conventions.CRUD" version="5.0.3" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Identity" version="4.1.0" />
   <module moduleId="Intent.AspNetCore.Identity.AccountController" version="3.1.0-pre.0" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -30,10 +30,10 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/AspNetCore.Controllers.Secured/modules.config b/Tests/AspNetCore.Controllers.Secured/modules.config
index 027b0ce01c..838c7b1065 100644
--- a/Tests/AspNetCore.Controllers.Secured/modules.config
+++ b/Tests/AspNetCore.Controllers.Secured/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.Application.ServiceImplementations" version="4.5.1" />
@@ -20,12 +20,12 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -34,11 +34,11 @@
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/AzureFunctions.TestApplication/modules.config b/Tests/AzureFunctions.TestApplication/modules.config
index 76fbc3b7be..152d859eec 100644
--- a/Tests/AzureFunctions.TestApplication/modules.config
+++ b/Tests/AzureFunctions.TestApplication/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.Application.ServiceImplementations" version="4.5.1" />
@@ -25,7 +25,7 @@
   <module moduleId="Intent.AzureFunctions.Interop.EntityFrameworkCore" version="4.2.1-pre.0" />
   <module moduleId="Intent.AzureFunctions.OpenApi" version="1.0.4-pre.0" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -36,12 +36,12 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
 </modules>
\ No newline at end of file
diff --git a/Tests/AzureKeyVault/modules.config b/Tests/AzureKeyVault/modules.config
index c73a717754..db632b2b7a 100644
--- a/Tests/AzureKeyVault/modules.config
+++ b/Tests/AzureKeyVault/modules.config
@@ -11,7 +11,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
@@ -21,7 +21,7 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.Azure.KeyVault" version="2.0.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -31,12 +31,12 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
diff --git a/Tests/Blazor.Server.MinimalHosting.TopLevelStatements/modules.config b/Tests/Blazor.Server.MinimalHosting.TopLevelStatements/modules.config
index f79345f341..f96711192b 100644
--- a/Tests/Blazor.Server.MinimalHosting.TopLevelStatements/modules.config
+++ b/Tests/Blazor.Server.MinimalHosting.TopLevelStatements/modules.config
@@ -3,7 +3,7 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.Blazor.Server" version="1.0.1-pre.0" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
diff --git a/Tests/Blazor.Server.MinimalHosting/modules.config b/Tests/Blazor.Server.MinimalHosting/modules.config
index f79345f341..f96711192b 100644
--- a/Tests/Blazor.Server.MinimalHosting/modules.config
+++ b/Tests/Blazor.Server.MinimalHosting/modules.config
@@ -3,7 +3,7 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.Blazor.Server" version="1.0.1-pre.0" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
diff --git a/Tests/Blazor.Server/modules.config b/Tests/Blazor.Server/modules.config
index f79345f341..f96711192b 100644
--- a/Tests/Blazor.Server/modules.config
+++ b/Tests/Blazor.Server/modules.config
@@ -3,7 +3,7 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.Blazor.Server" version="1.0.1-pre.0" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
diff --git a/Tests/CleanArchitecture.Dapr/CleanArchitecture.Dapr.Infrastructure/CleanArchitecture.Dapr.Infrastructure.csproj b/Tests/CleanArchitecture.Dapr/CleanArchitecture.Dapr.Infrastructure/CleanArchitecture.Dapr.Infrastructure.csproj
index e866bce910..b30ba82751 100644
--- a/Tests/CleanArchitecture.Dapr/CleanArchitecture.Dapr.Infrastructure/CleanArchitecture.Dapr.Infrastructure.csproj
+++ b/Tests/CleanArchitecture.Dapr/CleanArchitecture.Dapr.Infrastructure/CleanArchitecture.Dapr.Infrastructure.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Tests/CleanArchitecture.Dapr/modules.config b/Tests/CleanArchitecture.Dapr/modules.config
index 6719dc2094..d997947595 100644
--- a/Tests/CleanArchitecture.Dapr/modules.config
+++ b/Tests/CleanArchitecture.Dapr/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.CRUD.Eventing" version="5.0.1" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
@@ -22,7 +22,7 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Dapr.AspNetCore" version="2.0.2" />
   <module moduleId="Intent.Dapr.AspNetCore.Bindings.Cron" version="1.0.2" />
@@ -46,17 +46,17 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.Services" version="1.0.2" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.ServiceProxies" version="5.0.2" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Types.ServiceProxies" version="5.2.2" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
diff --git a/Tests/CleanArchitecture.OnlyModeledDomainEvents/CleanArchitecture.OnlyModeledDomainEvents.Infrastructure/CleanArchitecture.OnlyModeledDomainEvents.Infrastructure.csproj b/Tests/CleanArchitecture.OnlyModeledDomainEvents/CleanArchitecture.OnlyModeledDomainEvents.Infrastructure/CleanArchitecture.OnlyModeledDomainEvents.Infrastructure.csproj
index b0873a6f13..b78ff23028 100644
--- a/Tests/CleanArchitecture.OnlyModeledDomainEvents/CleanArchitecture.OnlyModeledDomainEvents.Infrastructure/CleanArchitecture.OnlyModeledDomainEvents.Infrastructure.csproj
+++ b/Tests/CleanArchitecture.OnlyModeledDomainEvents/CleanArchitecture.OnlyModeledDomainEvents.Infrastructure/CleanArchitecture.OnlyModeledDomainEvents.Infrastructure.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="12.0.1" />
-    <PackageReference Include="IEvangelist.Azure.CosmosRepository" Version="3.7.0" />
+    <PackageReference Include="IEvangelist.Azure.CosmosRepository" Version="8.1.2" />
     <PackageReference Include="Intent.RoslynWeaver.Attributes" Version="2.1.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
diff --git a/Tests/CleanArchitecture.OnlyModeledDomainEvents/CleanArchitecture.OnlyModeledDomainEvents.Infrastructure/Repositories/CosmosDBRepositoryBase.cs b/Tests/CleanArchitecture.OnlyModeledDomainEvents/CleanArchitecture.OnlyModeledDomainEvents.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
index 84bdb1370f..84f45faf34 100644
--- a/Tests/CleanArchitecture.OnlyModeledDomainEvents/CleanArchitecture.OnlyModeledDomainEvents.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
+++ b/Tests/CleanArchitecture.OnlyModeledDomainEvents/CleanArchitecture.OnlyModeledDomainEvents.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
@@ -68,8 +68,7 @@ public void Remove(TDomain entity)
         public async Task<List<TDomain>> FindAllAsync(CancellationToken cancellationToken = default)
         {
             var documents = await _cosmosRepository.GetAsync(_ => true, cancellationToken);
-            var results = documents.Select(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -82,8 +81,7 @@ public async Task<List<TDomain>> FindAllAsync(CancellationToken cancellationToke
             try
             {
                 var document = await _cosmosRepository.GetAsync(id, partitionKey, cancellationToken: cancellationToken);
-                var entity = document.ToEntity();
-                Track(entity);
+                var entity = LoadAndTrackDocument(document);
 
                 return entity;
             }
@@ -98,8 +96,7 @@ public virtual async Task<List<TDomain>> FindAllAsync(
             CancellationToken cancellationToken = default)
         {
             var documents = await _cosmosRepository.GetAsync(AdaptFilterPredicate(filterExpression), cancellationToken);
-            var results = documents.Select(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -119,9 +116,12 @@ public virtual async Task<IPagedList<TDomain>> FindAllAsync(
             CancellationToken cancellationToken = default)
         {
             var pagedDocuments = await _cosmosRepository.PageAsync(AdaptFilterPredicate(filterExpression), pageNo, pageSize, true, cancellationToken);
-            Track(pagedDocuments.Items.Select(document => document.ToEntity()));
+            var entities = LoadAndTrackDocuments(pagedDocuments.Items).ToList();
 
-            return new CosmosPagedList<TDomain, TDocument>(pagedDocuments, pageNo, pageSize);
+            var totalCount = pagedDocuments.Total ?? 0;
+            var pageCount = pagedDocuments.TotalPages ?? 0;
+
+            return new CosmosPagedList<TDomain, TDocument>(entities, totalCount, pageCount, pageNo, pageSize);
         }
 
         public async Task<List<TDomain>> FindByIdsAsync(
@@ -131,8 +131,7 @@ public async Task<List<TDomain>> FindByIdsAsync(
             var queryDefinition = new QueryDefinition($"SELECT * from c WHERE ARRAY_CONTAINS(@ids, c.{_idFieldName})")
                 .WithParameter("@ids", ids);
             var documents = await _cosmosRepository.GetByQueryAsync(queryDefinition, cancellationToken);
-            var results = documents.Select(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -148,17 +147,21 @@ private static Expression<Func<TDocument, bool>> AdaptFilterPredicate(Expression
             return Expression.Lambda<Func<TDocument, bool>>(visitor.Visit(expression.Body)!, afterParameter);
         }
 
-        public void Track(IEnumerable<TDomain> items)
+        public TDomain LoadAndTrackDocument(TDocument document)
         {
-            foreach (var item in items)
-            {
-                _unitOfWork.Track(item);
-            }
+            var entity = document.ToEntity();
+
+            _unitOfWork.Track(entity);
+
+            return entity;
         }
 
-        public void Track(TDomain item)
+        public IEnumerable<TDomain> LoadAndTrackDocuments(IEnumerable<TDocument> documents)
         {
-            _unitOfWork.Track(item);
+            foreach (var document in documents)
+            {
+                yield return LoadAndTrackDocument(document);
+            }
         }
 
         private class SubstitutionExpressionVisitor : ExpressionVisitor
diff --git a/Tests/CleanArchitecture.OnlyModeledDomainEvents/CleanArchitecture.OnlyModeledDomainEvents.Infrastructure/Repositories/CosmosPagedList.cs b/Tests/CleanArchitecture.OnlyModeledDomainEvents/CleanArchitecture.OnlyModeledDomainEvents.Infrastructure/Repositories/CosmosPagedList.cs
index 1219e210f7..f962177b86 100644
--- a/Tests/CleanArchitecture.OnlyModeledDomainEvents/CleanArchitecture.OnlyModeledDomainEvents.Infrastructure/Repositories/CosmosPagedList.cs
+++ b/Tests/CleanArchitecture.OnlyModeledDomainEvents/CleanArchitecture.OnlyModeledDomainEvents.Infrastructure/Repositories/CosmosPagedList.cs
@@ -14,16 +14,16 @@ internal class CosmosPagedList<TDomain, TDocument> : List<TDomain>, IPagedList<T
         where TDomain : class
         where TDocument : ICosmosDBDocument<TDomain, TDocument>
     {
-        public CosmosPagedList(IPageQueryResult<TDocument> pagedResult, int pageNo, int pageSize)
+        public CosmosPagedList(IEnumerable<TDomain> pagedResult, int totalCount, int pageCount, int pageNo, int pageSize)
         {
-            TotalCount = pagedResult.Total ?? 0;
-            PageCount = pagedResult.TotalPages ?? 0;
+            TotalCount = totalCount;
+            PageCount = pageCount;
             PageNo = pageNo;
             PageSize = pageSize;
 
-            foreach (var result in pagedResult.Items)
+            foreach (var result in pagedResult)
             {
-                Add(result.ToEntity());
+                Add(result);
             }
         }
 
diff --git a/Tests/CleanArchitecture.OnlyModeledDomainEvents/CleanArchitecture.OnlyModeledDomainEvents.application.config b/Tests/CleanArchitecture.OnlyModeledDomainEvents/CleanArchitecture.OnlyModeledDomainEvents.application.config
index 1297dd737d..85b4374a2b 100644
--- a/Tests/CleanArchitecture.OnlyModeledDomainEvents/CleanArchitecture.OnlyModeledDomainEvents.application.config
+++ b/Tests/CleanArchitecture.OnlyModeledDomainEvents/CleanArchitecture.OnlyModeledDomainEvents.application.config
@@ -55,6 +55,18 @@
         </setting>
       </settings>
     </group>
+    <group id="e9f6758c-f8db-4cad-af33-827b867be548" title="CosmosDb">
+      <module>Intent.CosmosDB</module>
+      <icon type="UrlImagePath" source="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAAXNSR0IArs4c6QAAE8VJREFUeF7tXHl4VNXZ/7333lmzkY0lhEVIpCIEhNAGKGIolkVrrQqttlpcCKhVK0r1e2p1fKTWfi64VBS0aj+XWmNrWxZFahMUIgUEYgAxi2ExkIXsy2z3nvd77pCEyWSSuTMT9aly/kvmnHf53ffcdznvuYQzIyoEyOjqjR9PnShLvG/+hD2y0TXfhHmGAdxcMuU+JtxrqWuIyc097PomgGNER8MAvl1y3i4imsqaetWCSR+/boT4N2GOIQCZIW0+OKUajFQC/jNvwp6cbwI4RnQ0BODbJVMuI8JLAOIAnFSF9zsXZ5V8ZoTB131OSAA3F2fFsKx8AGAyAH2+m4jXzjt3721fd3CM6NcvgA4HpJwrzlsJ0N0ABnUTJNQR4555E/asM8Lk6zynTwCLjk23NTe5f0GEOwEM9geBCAzGcYAenDfhozVfZ4BC6RYUwLdLsi8gSdwIxhwAKf0QqQboTyxrzy44Z9/hUMy+jr/7ANxUlmGxiJgUr5cuZZaWEVEimIeAYDKgdBuAGgYOg7FGEuq2D7M+PukgCANr/+un0PrdU+0mKx9lQCLAAsAeiVYMCAI6APKAWAhzS/rCzHJ3JLT+m9bQ7t1TTSet6j2A/G0AWSAMAUPq9LjGdDllbcyMI8T4REi8uW18xprFlK8ZI/ClziI4HIQD4327L8kcGyOsprGKrMwB4zwiZDE4HUApGJsF09sNtvS9qN6rIn+RAIh7+INA0V8sGG0dkpx4G0l0pwQkMPrZxgQXMY6zwKr5WXtejAaGJS8WWNuHpMdZJK9ihI67hVvPXTS+w0EU8lWRccsmS7NmS9ScHhNJprMh0XKJcCkAQ7x0eXTjYInvVaWO9c1DLmqG4xTfPr3wpuIpObKCu5jx/T62dSuAPwqL6b6Fmf9pMaJ04JwlBZWDnO3OdJkUhTVxAUt0KwFnGaElgKdk0D815jrBSiNcH1XlL17cbfFpeevtgmPO0kAmAZ4hER4DSH9FRTWY8Q9Jlh+uFfadWJft7TcO3FyeNZhdih6m/ACA2Y9zGxGemXfunl+FK43DwdKn00vPhksbwbJ8AQE39YgxwyUIeMHYysAaTRPlO9+vVZztnMLM4wDcFyKKCJ/bqRUVYFxR99wFxSEzkU37J8+UIL0GYKTPlAEB5g/Y2jovXCfxs3fKMzRVmwngZwDlAhx1acwiEeJMEmQiWAhFleVt9n2lrVlNrV6px8uqX6j07chOgNsB0neTF2ALQKkAYoPuVOb/q2sasjQkgDrft0umOIhwFwArgBYwls6fuOcNo49vUcGBWLNTmSUEXwvQZQCiBk4PGYZZFcQqElItMhT9H52jpKJNVJ7oQHFFm+T29npFMoNbiGgHMR8ESAiwIKIWoaFRIq6TJLg1je1ENJpBSUQ4F0Bup/6n1VYwzBCABQfGx7phrQQjhYHPFkzYM9YweG/sSZXtsfcT+HzAJ8iAjNF2E0bGKJAouAoeVYjislZp864G4fJoBKJKFuIVidAmgGYN2oeNadsPwOEI6YSSlv77XInwewJd5C88g39qCEB90Tv7zysHaAyzeGTBxH2G3n2XvrV3kNVkf4GAHw0Ian5EZqXafNs21Nhf2cZlx51vfnSo+YU6NwrxUm5ExeDkvIJfEPP9RJTUxVMAvw0tQefsd0qmPA4Jt3i92sgfTC6uCiX4ZX89OMxill4BkZ4ODuiwS4Rvp9gM0xQCh9ya+McvZ47SiyIRjdRlBdeD8QCAYREBuLFk0mKZ5D8bORO55B9H02Ik5wYQzotI2hCL0q0yMuLDi0gEo6FDFU/dMXOUIxKZUpYV3kvM96BHXCzuMWyBbxRNtyXEqSnzJu461p8Ai94ossm2pG1EpINnmH5/NBWCb7t27VgTAVOTjFtgJ21m5mqN+fc354x6IlwQU/MKVgH4dY91GjIHRMFuosx05cay7SDOAUcHnkzASLsJI+ymbuD8hY9UcGb8p8PlWbpi9tgSoyCmLiuYz0yPEni8/xop3hMbqRy9eDsKWCntKP0nMxYYFSzYPF2gRLOMc+LNMPmFJtHQDLL2tZZGU97KeUPbQ9J1FCiDq/BLJjzsP5eJ3o9187wBA/DKjaWXg/n3AAyHOMGE1+O6yYMsPeK6kEpGNIEfdye67741M7PfilFKXmEuET8Dhp7ZdL0NBDQaV/fH3PIBAfAnb30ymkzSHwD0iJPC1asrOM6M888aw6VibL5g3sUarbxpxoitfa1IuPGDRLOqrgBBdx7+40MouKxuTW511ADque2h7NIHCL5MJaoMQ0/LpocRnhiDqu9ZBDzBUseqZdnjTgbO0osRXsTcAFCgw2kWrF1Y/9zcXfqaqAG8amPpZGb+XwAXRqvQVwDg5yDk5U0b8XYP2R0sDT6x9TvM/Cp6V4eeh4Lf6NY3MACuP3QbEz0arfXpwujvv+wkPd3+8gaBV1obG5+5Zt6kboeSmLclQWblT0T4YQ9JGFs08O0Nz8050PX/qCxw0cYDQ2Uh30dEywdC5RiZMC057PguWtbFMknX3jBt+N5OQpS69N8vgegaf8IMHBOgOxpK+S0U5qoDAuBPNhy8iCA/55/eRKPNl72FT/tU8f3lOaO26H+n5hW8CeDyAMvTo9qnTcD9x9fl9nhfRmWBV60/9FMmeiUa0PzXflUAksS/canuJ1e9UPUygy8Jok++JrCi4fnczwN/ixjARW9UJCh2VW/vuH+gANSFSbbImJAQXp4bPX9uevqtYw0n6t2jAAqMJDbKXvna6hfPrwvGJ2IAf7ypLIeE9hcC+SrVAzXsMmFiggU2RT8Y/HLGq1tO4NDRdv3gqOdg3u710sVNL+U29SVJxAA+u+PIhSRJ74ZS0SsYFa0e1Lg1/TjA0NC98dmxJsSZ5ejjrH44CsHIL6xByWd6b4D/IL1qfdAlmee0PTuztj+hv3AAu5g3eDQcbPFAFUZhPFWyHxWjnzxGLGafumuqwJad9dj9adADxU+FB5fWv5R7KNQTj1gyoxboL0CdS0NZmweeMEAMpUC4v+vb1O3SUFnWiqrDHcGW7/eo2g+bX5hrqP8xIgAdDoeUdOGSBRaTvCEcBTRmHG7z4pizO4wKZ3nUczWN0dLgwfGjHThR5exNj/GB14trml7KNdwoFT6ADpbSjheeff7kxNtys5PDDqCrOryobPdCNb6TowZOJ6CDV1XZjqoj7Whv791xEhtvKhUubf6RP8yuDIdh2ACm5L03hSDfnTnc9qOfL0gz3BrRJVSrV0NFmxdNvY8bw5E7rLn6tq041IKj5W0I9vYYkmbDqIyYNXazdFf+4nMDPUq/vMICMPGGf2XJkvwoAXMzhtuxZEFaWIrok1VmlOle2fXl9B3pzqL8k1YcqwxeOx2abkPGt+JhtUv3qB0Nj+UvnhFkb/etpmEABy/79yRmPAmQfr6LSAF0aQLlbV6cdA8cgCYiXwA+yCT1KP/vPNiEw9Uu1BzvfZIZZ5GQlRGH8eN08GS4POrVJwc1/2VddrY3HKswBGD8knczLWbTCwC+20U8UgB1R+LUGHp8qG+nEx1e1HuF4RgxULkYRUJmrAk2WYJZpu6AZ9OOkyipaEWrs/eDSksyY9bEQRiTHoMYW2fioSEnLyd9J1HP9rVQYIYEMC6vIMUCfp1AF/iXrMam2fDz+WmQoji30P2IxwemwO7G8HsxrTJhUoIVNv3YrnM0NLpQsK8JB460wxPEU40cYsVl3x2MQfEmKPrJVefQBCbdlDPi41CABf4eEsDUZYV/A4tLAnPEpASl8ubLRxVbJNL77KIebsH48KTx149ChGlJFljk0ynfzgNN2FrciDaXgBbEWwxLtuC6hWmwWXoXzr8QAFPyCl8l4EqAA4Cmj1flzc7W1M+vlSWsjRq9TgLhgKg3E323s/zvdKn4YF8j3t/fHFQUfZPkZiUgd5rebNV7uFR+xyVJS+/KSe9VbQmlW3ALdBQoKVX8WyK6tVdHEmF/3drciTrhZ3dVXQkWrxB8LcFRD42BI20eHDUQaA+3yBhlN+HwCSdef6/a9yoItr3sVhm3XjYCMfa+Iy6nV7tie9Wov+cvprA9W1AAU5e9dz4LepiI9L7p7sGggyfTZk/sam9d/eGxC8zEaxSJzokavU4CrarARw2h+38GexnlnzZj52dB0zHE22Ukxyi4euFwmE19P1/B6BCsXXxzzuiCSHToBWDKddvSSFEfAPi6AIIVHrl9WvMzFzd2/X/tbjZBO7YSRL+NhHmwNaEAbGnyQFUZe4rq+2Q5JNGM+dlJPi8r+zmKYAs6vCK/TeW7fjN7dFgZSBetHgCm315k87S7bmFIvwPY77Fxh6bxkoY/fi8/UIhndhy7nIgf0ZsRBwLEvgB0dahobVZRdrAZHUFSMZ13UpyCoUkWnD8pEemDQx9OaQKqKviaW2eM/HOksvcAMPX6LedBVp4GMN2foAA9aUHs/xxfl91rvzy0pSIhPt70kDxAB0uBAOp3Jxrq3Kj53InaapfP+gKHbmRpyRZMnzAI40baYTEbO55WNf6XS5XuvGNWenHUACb9dFO8bLffDOIHA4j9hYR2W+3zc2v6YvKHoiMXKzI9RERRdaDqOWutS8UnrR5fdbipwY36Gjfqalxobw1ewUmIUZB9dhzGDLNhVJrxO0Iewc0ujVeunDHyeYQZPPvj0G2BQ5YXTBCC/gZwpp/baCEhXVGbXvhef62wjoJKa4JFetaqSFdLUXhkPTspbnShutHjy11bm71oaQqeWckSYdKYGIw/Kw4Zw21QwjwCcAvx5vE2910PzT3bUN2vL+M5BaCjQEk+wRdJTH/vMZGxyqMojzU/M6vbcfRF6OH3P8uKtZqel4BpkWwHfWPurXVi+656uFwaWhr12wvBh1kCfjx3GIYmmZEQa+Q6X086GmNHi6bdcfeM0UWRyNrLAlOXFAyFid8EkX4FoXNwPTMtOflcruGi6YPbjs5KMtOLFGaHVkuLB68V1qLZraGtxdv7cMdP4itmpWJwkgVpqaGdRDBw3EI01TrVx2vjGh8Mt3AQjJ7PAofcsPUsIYlS/6tPDNwvx3sernlkXugeuk7KjoICRaOReWk20+8kovhQT7e8shVb9jX5Ev6Wjv6r1GdlxODCCYkYnmgJGZr0xVcwuF0V7x5p9ix+amFmRLerAmmfAvDGf40RmlzR80e+rW7dnCdDgRD4uw5imXP4WhK8hClIhqL3SFS24UhFOzwuEfKQafAwK8aOi4M9TkF2sg1xYb7ruuTTU+N2r/aRucU789aF/fcEhqOzD8CUG7eNI80bcAIVGYBdzK/cULoB4AuZYRYaw9nmxWeftqK2JnTVRQ9+4xIUX6FzUMrpQ/YpiVbE95NV9KU4A9zi1g79atboHi264QDV19xTFnh9wQQhI6BnOHIAU28qiJUFUibnJN3j6tCuL93fAq+BQxCLRYI9VsHYb8VhUHLv7oThVhlj4syG7od0KewV7Kzu8JatmjN20kAAFsYWxuNCEo/U19dXI//0LchgQgy5enOMsFvTBGtJMrMsmL5HEultH8lGhI6NU6CYJGSeE4eEIMD505iQYEayRTF0Uqyx+LSs1fvO6rkZvzQiB+7YMRWP5nxkaG7nJJ8FJuZ9MFKBdxdAPT4uweCXwbSJ2XcRr5Vl2amoQtIUWKEhVu68ZyWA0WC+tLP4YKg/zWTSt6kZskI+4OxxxsOR8fFmWGWpz+3s1tAqEXYddbp+bd+asdPRebc3JDC3Fx1DwvRRXcWSkPO7jvxTrtsWR4pXb9HteQ+imwLpDuwEgCYCKwAlADwYoLDLWCaFTg5KNsuJyebEoel2mK3G0q5AZWIVQpqtZ9cCAVqMIm1v84rCFs2zbvX3xoW8UeVHl7Ci6Djc2mw8PUuPSAyN7kzEZ4WsPg4a+HttALUyuFAC7YtNkE5kTU1WbDHKVJCvKb2/r4IYUkK/QcqM9wHslkje8NpFY/eEnZ7dvv0nIFoL5nexeuYio4xPFxOYKXX5+xnM6r2A9GPq76q/Aep6dw4R/gagECTahabsqH9+9iddS3/214PDhFmaA1AiE88G6AoDZE9PIagseDsBG0FUq6rqrvxLx38S+E0DQzSXvzccNuvfQdKUzirUYjw2o1flKRitXvXAocsLRqsqTQeJBUSk31Q//cWi/qU5CfBWAr/HJDWASYBoX93a2WWhlLhq/cFMZunUvTpZkoXgYQQxhogG86nvdemxz3ESVM0kyolJZf1DF0KriB8+fv+6bArrKLKHPLcXTQTodhDrVqdfrtbHITA9gdXTnw0lex8lfZaSPi9MU2QaIYQws4BCkjQGhKEEFqyhBhLrbV/dhxBMcJkkqok1OU+UP7UwdLDXl2TMdPXLH9vVBCmWlBirVxUmk9ohvFa5A+1WZ/6iMS1hb89AXit2joBQF0DCbDAmgJDR47sQ+neZCDVg7AXxTgjpn6g6VhwsGgl5KneKN9PoJYWWNsnkc5Wxwus93F7nDRXehHp6X9nvK7YtBCT9ZsGYgG9BBIqkX8bWDeVFWKyr8bspvbpUDQL4lan6xTB2vGFGU6Yd5JRA/GuAlnZ+2q+Ln568HICH5yGWnbDa3MAGV7CS3jcTwMDHcseHt0DwfaDOwJ9RgtUzsow8vTMAdqG0omg9mBeAqB2PzUgwAp4+5wyAXUjdWRwD0V4BgXvx+AzD30U8A6C/qa0oOgFv02iEEUWcAdDoXu1j3hkAzwAYJQJRLj9jgWcAjBKBKJefscAzAEaJQJTL/x/owZPu7GUDVwAAAABJRU5ErkJggg==" />
+      <settings>
+        <setting id="fcb114f7-77b4-4c6a-96c0-41bb146f4166" title="Use Optimistic Concurrency" module="Intent.CosmosDB" type="switch">
+          <hint>Ensures updates are applied only when document etags match, for improved concurrency management</hint>
+          <value>false</value>
+          <isRequired>true</isRequired>
+          <options />
+        </setting>
+      </settings>
+    </group>
     <group id="2392c046-0aa7-4ee5-a77a-e954c4a7aab5" title="CQRS Settings">
       <module>Intent.Application.MediatR</module>
       <icon type="UrlImagePath" source="data:image/png;base64,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" />
diff --git a/Tests/CleanArchitecture.OnlyModeledDomainEvents/modules.config b/Tests/CleanArchitecture.OnlyModeledDomainEvents/modules.config
index 928b6c20cc..0cb6955c50 100644
--- a/Tests/CleanArchitecture.OnlyModeledDomainEvents/modules.config
+++ b/Tests/CleanArchitecture.OnlyModeledDomainEvents/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.Application.ServiceImplementations" version="4.5.1" />
@@ -20,15 +20,15 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.HealthChecks" version="2.0.2-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
-  <module moduleId="Intent.CosmosDB" version="1.0.3" />
+  <module moduleId="Intent.CosmosDB" version="1.0.4-pre.0" />
   <module moduleId="Intent.DocumentDB.Dtos.AutoMapper" version="1.0.0" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -42,12 +42,12 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/CleanArchitecture.ServiceModelling.ComplexTypes/modules.config b/Tests/CleanArchitecture.ServiceModelling.ComplexTypes/modules.config
index 113e017967..23ff382569 100644
--- a/Tests/CleanArchitecture.ServiceModelling.ComplexTypes/modules.config
+++ b/Tests/CleanArchitecture.ServiceModelling.ComplexTypes/modules.config
@@ -12,19 +12,19 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.Application.ServiceImplementations" version="4.5.1" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.DomainServices" version="1.1.3" />
@@ -38,14 +38,14 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.Services" version="1.0.2" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/CleanArchitecture.SingleFiles/CleanArchitecture.SingleFiles.Infrastructure/CleanArchitecture.SingleFiles.Infrastructure.csproj b/Tests/CleanArchitecture.SingleFiles/CleanArchitecture.SingleFiles.Infrastructure/CleanArchitecture.SingleFiles.Infrastructure.csproj
index 9a741f717a..f6945db448 100644
--- a/Tests/CleanArchitecture.SingleFiles/CleanArchitecture.SingleFiles.Infrastructure/CleanArchitecture.SingleFiles.Infrastructure.csproj
+++ b/Tests/CleanArchitecture.SingleFiles/CleanArchitecture.SingleFiles.Infrastructure/CleanArchitecture.SingleFiles.Infrastructure.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="12.0.1" />
     <PackageReference Include="Dapr.Client" Version="1.9.0" />
-    <PackageReference Include="IEvangelist.Azure.CosmosRepository" Version="3.7.0" />
+    <PackageReference Include="IEvangelist.Azure.CosmosRepository" Version="8.1.2" />
     <PackageReference Include="Intent.RoslynWeaver.Attributes" Version="2.1.4" />
     <PackageReference Include="MassTransit" Version="8.0.16" />
     <PackageReference Include="MassTransit.Abstractions" Version="8.0.16" />
diff --git a/Tests/CleanArchitecture.SingleFiles/CleanArchitecture.SingleFiles.Infrastructure/Repositories/CosmosDBRepositoryBase.cs b/Tests/CleanArchitecture.SingleFiles/CleanArchitecture.SingleFiles.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
index d8fcc12fe3..40b59c57b2 100644
--- a/Tests/CleanArchitecture.SingleFiles/CleanArchitecture.SingleFiles.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
+++ b/Tests/CleanArchitecture.SingleFiles/CleanArchitecture.SingleFiles.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
@@ -68,8 +68,7 @@ public void Remove(TDomain entity)
         public async Task<List<TDomain>> FindAllAsync(CancellationToken cancellationToken = default)
         {
             var documents = await _cosmosRepository.GetAsync(_ => true, cancellationToken);
-            var results = documents.Select(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -82,8 +81,7 @@ public async Task<List<TDomain>> FindAllAsync(CancellationToken cancellationToke
             try
             {
                 var document = await _cosmosRepository.GetAsync(id, partitionKey, cancellationToken: cancellationToken);
-                var entity = document.ToEntity();
-                Track(entity);
+                var entity = LoadAndTrackDocument(document);
 
                 return entity;
             }
@@ -98,8 +96,7 @@ public virtual async Task<List<TDomain>> FindAllAsync(
             CancellationToken cancellationToken = default)
         {
             var documents = await _cosmosRepository.GetAsync(AdaptFilterPredicate(filterExpression), cancellationToken);
-            var results = documents.Select(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -119,9 +116,12 @@ public virtual async Task<IPagedList<TDomain>> FindAllAsync(
             CancellationToken cancellationToken = default)
         {
             var pagedDocuments = await _cosmosRepository.PageAsync(AdaptFilterPredicate(filterExpression), pageNo, pageSize, true, cancellationToken);
-            Track(pagedDocuments.Items.Select(document => document.ToEntity()));
+            var entities = LoadAndTrackDocuments(pagedDocuments.Items).ToList();
 
-            return new CosmosPagedList<TDomain, TDocument>(pagedDocuments, pageNo, pageSize);
+            var totalCount = pagedDocuments.Total ?? 0;
+            var pageCount = pagedDocuments.TotalPages ?? 0;
+
+            return new CosmosPagedList<TDomain, TDocument>(entities, totalCount, pageCount, pageNo, pageSize);
         }
 
         public async Task<List<TDomain>> FindByIdsAsync(
@@ -131,8 +131,7 @@ public async Task<List<TDomain>> FindByIdsAsync(
             var queryDefinition = new QueryDefinition($"SELECT * from c WHERE ARRAY_CONTAINS(@ids, c.{_idFieldName})")
                 .WithParameter("@ids", ids);
             var documents = await _cosmosRepository.GetByQueryAsync(queryDefinition, cancellationToken);
-            var results = documents.Select(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -148,17 +147,21 @@ private static Expression<Func<TDocument, bool>> AdaptFilterPredicate(Expression
             return Expression.Lambda<Func<TDocument, bool>>(visitor.Visit(expression.Body)!, afterParameter);
         }
 
-        public void Track(IEnumerable<TDomain> items)
+        public TDomain LoadAndTrackDocument(TDocument document)
         {
-            foreach (var item in items)
-            {
-                _unitOfWork.Track(item);
-            }
+            var entity = document.ToEntity();
+
+            _unitOfWork.Track(entity);
+
+            return entity;
         }
 
-        public void Track(TDomain item)
+        public IEnumerable<TDomain> LoadAndTrackDocuments(IEnumerable<TDocument> documents)
         {
-            _unitOfWork.Track(item);
+            foreach (var document in documents)
+            {
+                yield return LoadAndTrackDocument(document);
+            }
         }
 
         private class SubstitutionExpressionVisitor : ExpressionVisitor
diff --git a/Tests/CleanArchitecture.SingleFiles/CleanArchitecture.SingleFiles.Infrastructure/Repositories/CosmosPagedList.cs b/Tests/CleanArchitecture.SingleFiles/CleanArchitecture.SingleFiles.Infrastructure/Repositories/CosmosPagedList.cs
index 76d7faad99..f06ced7bb1 100644
--- a/Tests/CleanArchitecture.SingleFiles/CleanArchitecture.SingleFiles.Infrastructure/Repositories/CosmosPagedList.cs
+++ b/Tests/CleanArchitecture.SingleFiles/CleanArchitecture.SingleFiles.Infrastructure/Repositories/CosmosPagedList.cs
@@ -14,16 +14,16 @@ internal class CosmosPagedList<TDomain, TDocument> : List<TDomain>, IPagedList<T
         where TDomain : class
         where TDocument : ICosmosDBDocument<TDomain, TDocument>
     {
-        public CosmosPagedList(IPageQueryResult<TDocument> pagedResult, int pageNo, int pageSize)
+        public CosmosPagedList(IEnumerable<TDomain> pagedResult, int totalCount, int pageCount, int pageNo, int pageSize)
         {
-            TotalCount = pagedResult.Total ?? 0;
-            PageCount = pagedResult.TotalPages ?? 0;
+            TotalCount = totalCount;
+            PageCount = pageCount;
             PageNo = pageNo;
             PageSize = pageSize;
 
-            foreach (var result in pagedResult.Items)
+            foreach (var result in pagedResult)
             {
-                Add(result.ToEntity());
+                Add(result);
             }
         }
 
diff --git a/Tests/CleanArchitecture.SingleFiles/CleanArchitecture.SingleFiles.application.config b/Tests/CleanArchitecture.SingleFiles/CleanArchitecture.SingleFiles.application.config
index a1b9e20e3c..546bda2852 100644
--- a/Tests/CleanArchitecture.SingleFiles/CleanArchitecture.SingleFiles.application.config
+++ b/Tests/CleanArchitecture.SingleFiles/CleanArchitecture.SingleFiles.application.config
@@ -59,6 +59,18 @@
         </setting>
       </settings>
     </group>
+    <group id="e9f6758c-f8db-4cad-af33-827b867be548" title="CosmosDb">
+      <module>Intent.CosmosDB</module>
+      <icon type="UrlImagePath" source="data:image/png;base64,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" />
+      <settings>
+        <setting id="fcb114f7-77b4-4c6a-96c0-41bb146f4166" title="Use Optimistic Concurrency" module="Intent.CosmosDB" type="switch">
+          <hint>Ensures updates are applied only when document etags match, for improved concurrency management</hint>
+          <value>false</value>
+          <isRequired>true</isRequired>
+          <options />
+        </setting>
+      </settings>
+    </group>
     <group id="2392c046-0aa7-4ee5-a77a-e954c4a7aab5" title="CQRS Settings">
       <module>Intent.Application.MediatR</module>
       <icon type="UrlImagePath" source="data:image/png;base64,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" />
diff --git a/Tests/CleanArchitecture.SingleFiles/modules.config b/Tests/CleanArchitecture.SingleFiles/modules.config
index b860f251a8..fcd8116a98 100644
--- a/Tests/CleanArchitecture.SingleFiles/modules.config
+++ b/Tests/CleanArchitecture.SingleFiles/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.CRUD.Eventing" version="5.0.1" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
@@ -22,15 +22,15 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.HealthChecks" version="2.0.2-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
-  <module moduleId="Intent.CosmosDB" version="1.0.3" />
+  <module moduleId="Intent.CosmosDB" version="1.0.4-pre.0" />
   <module moduleId="Intent.Dapr.AspNetCore" version="2.0.2" />
   <module moduleId="Intent.Dapr.AspNetCore.StateManagement" version="1.2.2" />
   <module moduleId="Intent.DocumentDB.Dtos.AutoMapper" version="1.0.0" />
@@ -42,21 +42,21 @@
   <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.5.0" />
   <module moduleId="Intent.Eventing.Contracts" version="5.0.3-pre.0" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.5-pre.1" />
-  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.5" />
+  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.4" />
   <module moduleId="Intent.Eventing.MassTransit.EntityFrameworkCore" version="5.1.0" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.4-pre.0" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.MongoDb" version="1.0.12" />
   <module moduleId="Intent.MongoDb.Repositories" version="1.1.1" />
diff --git a/Tests/CleanArchitecture.TestApplication/CleanArchitecture.TestApplication.BlazorClient/CleanArchitecture.TestApplication.BlazorClient.csproj b/Tests/CleanArchitecture.TestApplication/CleanArchitecture.TestApplication.BlazorClient/CleanArchitecture.TestApplication.BlazorClient.csproj
index 5b9394fe12..132227cadf 100644
--- a/Tests/CleanArchitecture.TestApplication/CleanArchitecture.TestApplication.BlazorClient/CleanArchitecture.TestApplication.BlazorClient.csproj
+++ b/Tests/CleanArchitecture.TestApplication/CleanArchitecture.TestApplication.BlazorClient/CleanArchitecture.TestApplication.BlazorClient.csproj
@@ -15,7 +15,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Tests/CleanArchitecture.TestApplication/CleanArchitecture.TestApplication.Infrastructure/CleanArchitecture.TestApplication.Infrastructure.csproj b/Tests/CleanArchitecture.TestApplication/CleanArchitecture.TestApplication.Infrastructure/CleanArchitecture.TestApplication.Infrastructure.csproj
index 4cf87784b7..a966854189 100644
--- a/Tests/CleanArchitecture.TestApplication/CleanArchitecture.TestApplication.Infrastructure/CleanArchitecture.TestApplication.Infrastructure.csproj
+++ b/Tests/CleanArchitecture.TestApplication/CleanArchitecture.TestApplication.Infrastructure/CleanArchitecture.TestApplication.Infrastructure.csproj
@@ -25,7 +25,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Tests/CleanArchitecture.TestApplication/modules.config b/Tests/CleanArchitecture.TestApplication/modules.config
index 4ad2eaf3ff..a2762c4a34 100644
--- a/Tests/CleanArchitecture.TestApplication/modules.config
+++ b/Tests/CleanArchitecture.TestApplication/modules.config
@@ -13,7 +13,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.CRUD.Eventing" version="5.0.1" />
   <module moduleId="Intent.Application.MediatR.CRUD.Tests" version="1.3.4" />
@@ -22,7 +22,7 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Cors" version="3.3.11" />
   <module moduleId="Intent.AspNetCore.HealthChecks" version="2.0.2-pre.1" />
   <module moduleId="Intent.AspNetCore.Identity.AccountController.Metadata" version="1.0.0-pre.0" />
@@ -35,7 +35,7 @@
   <module moduleId="Intent.Blazor.HttpClients.Dtos.FluentValidation" version="1.0.4" />
   <module moduleId="Intent.Blazor.WebAssembly" version="1.0.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.DomainServices" version="1.1.3" />
@@ -46,7 +46,7 @@
   <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.5.0" />
   <module moduleId="Intent.Eventing.Contracts" version="5.0.3-pre.0" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.5-pre.1" />
-  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.5" />
+  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.4" />
   <module moduleId="Intent.Eventing.MassTransit.EntityFrameworkCore" version="5.1.0" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Integration.HttpClients" version="5.1.0-pre.1" />
@@ -54,17 +54,17 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.Services" version="1.0.2" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.ServiceProxies" version="5.0.2" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Types.ServiceProxies" version="5.2.2" />
   <module moduleId="Intent.Modelers.WebClient" version="4.0.1-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
diff --git a/Tests/CosmosDB.EntityInterfaces/CosmosDB.EntityInterfaces.Infrastructure/CosmosDB.EntityInterfaces.Infrastructure.csproj b/Tests/CosmosDB.EntityInterfaces/CosmosDB.EntityInterfaces.Infrastructure/CosmosDB.EntityInterfaces.Infrastructure.csproj
index 7c63ccb033..0c0ce5ca40 100644
--- a/Tests/CosmosDB.EntityInterfaces/CosmosDB.EntityInterfaces.Infrastructure/CosmosDB.EntityInterfaces.Infrastructure.csproj
+++ b/Tests/CosmosDB.EntityInterfaces/CosmosDB.EntityInterfaces.Infrastructure/CosmosDB.EntityInterfaces.Infrastructure.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IEvangelist.Azure.CosmosRepository" Version="3.7.0" />
+    <PackageReference Include="IEvangelist.Azure.CosmosRepository" Version="8.1.2" />
     <PackageReference Include="Intent.RoslynWeaver.Attributes" Version="2.1.4" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
diff --git a/Tests/CosmosDB.EntityInterfaces/CosmosDB.EntityInterfaces.Infrastructure/Repositories/CosmosDBRepositoryBase.cs b/Tests/CosmosDB.EntityInterfaces/CosmosDB.EntityInterfaces.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
index bf01a105c5..8a59743aab 100644
--- a/Tests/CosmosDB.EntityInterfaces/CosmosDB.EntityInterfaces.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
+++ b/Tests/CosmosDB.EntityInterfaces/CosmosDB.EntityInterfaces.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
@@ -77,8 +77,7 @@ public void Remove(TDomain entity)
         public async Task<List<TDomain>> FindAllAsync(CancellationToken cancellationToken = default)
         {
             var documents = await _cosmosRepository.GetAsync(_ => true, cancellationToken);
-            var results = documents.Select<TDocument, TDomain>(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -91,8 +90,7 @@ public async Task<List<TDomain>> FindAllAsync(CancellationToken cancellationToke
             try
             {
                 var document = await _cosmosRepository.GetAsync(id, partitionKey, cancellationToken: cancellationToken);
-                var entity = document.ToEntity();
-                Track(entity);
+                var entity = LoadAndTrackDocument(document);
 
                 return entity;
             }
@@ -107,8 +105,7 @@ public virtual async Task<List<TDomain>> FindAllAsync(
             CancellationToken cancellationToken = default)
         {
             var documents = await _cosmosRepository.GetAsync(AdaptFilterPredicate(filterExpression), cancellationToken);
-            var results = documents.Select<TDocument, TDomain>(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -128,9 +125,12 @@ public virtual async Task<IPagedList<TDomain>> FindAllAsync(
             CancellationToken cancellationToken = default)
         {
             var pagedDocuments = await _cosmosRepository.PageAsync(AdaptFilterPredicate(filterExpression), pageNo, pageSize, true, cancellationToken);
-            Track(pagedDocuments.Items.Select(document => document.ToEntity()));
+            var entities = LoadAndTrackDocuments(pagedDocuments.Items).ToList();
 
-            return new CosmosPagedList<TDomain, TDomainState, TDocument>(pagedDocuments, pageNo, pageSize);
+            var totalCount = pagedDocuments.Total ?? 0;
+            var pageCount = pagedDocuments.TotalPages ?? 0;
+
+            return new CosmosPagedList<TDomain, TDomainState, TDocument>(entities, totalCount, pageCount, pageNo, pageSize);
         }
 
         public async Task<List<TDomain>> FindByIdsAsync(
@@ -140,8 +140,7 @@ public async Task<List<TDomain>> FindByIdsAsync(
             var queryDefinition = new QueryDefinition($"SELECT * from c WHERE ARRAY_CONTAINS(@ids, c.{_idFieldName})")
                 .WithParameter("@ids", ids);
             var documents = await _cosmosRepository.GetByQueryAsync(queryDefinition, cancellationToken);
-            var results = documents.Select<TDocument, TDomain>(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -157,17 +156,21 @@ private static Expression<Func<TDocument, bool>> AdaptFilterPredicate(Expression
             return Expression.Lambda<Func<TDocument, bool>>(visitor.Visit(expression.Body)!, afterParameter);
         }
 
-        public void Track(IEnumerable<TDomain> items)
+        public TDomain LoadAndTrackDocument(TDocument document)
         {
-            foreach (var item in items)
-            {
-                _unitOfWork.Track(item);
-            }
+            var entity = document.ToEntity();
+
+            _unitOfWork.Track(entity);
+
+            return entity;
         }
 
-        public void Track(TDomain item)
+        public IEnumerable<TDomain> LoadAndTrackDocuments(IEnumerable<TDocument> documents)
         {
-            _unitOfWork.Track(item);
+            foreach (var document in documents)
+            {
+                yield return LoadAndTrackDocument(document);
+            }
         }
 
         private (string UserName, DateTimeOffset TimeStamp) GetAuditDetails()
diff --git a/Tests/CosmosDB.EntityInterfaces/CosmosDB.EntityInterfaces.Infrastructure/Repositories/CosmosPagedList.cs b/Tests/CosmosDB.EntityInterfaces/CosmosDB.EntityInterfaces.Infrastructure/Repositories/CosmosPagedList.cs
index 6cf4eb1028..5473d2ab09 100644
--- a/Tests/CosmosDB.EntityInterfaces/CosmosDB.EntityInterfaces.Infrastructure/Repositories/CosmosPagedList.cs
+++ b/Tests/CosmosDB.EntityInterfaces/CosmosDB.EntityInterfaces.Infrastructure/Repositories/CosmosPagedList.cs
@@ -15,16 +15,16 @@ internal class CosmosPagedList<TDomain, TDomainState, TDocument> : List<TDomain>
         where TDomainState : class, TDomain
         where TDocument : ICosmosDBDocument<TDomain, TDomainState, TDocument>
     {
-        public CosmosPagedList(IPageQueryResult<TDocument> pagedResult, int pageNo, int pageSize)
+        public CosmosPagedList(IEnumerable<TDomain> pagedResult, int totalCount, int pageCount, int pageNo, int pageSize)
         {
-            TotalCount = pagedResult.Total ?? 0;
-            PageCount = pagedResult.TotalPages ?? 0;
+            TotalCount = totalCount;
+            PageCount = pageCount;
             PageNo = pageNo;
             PageSize = pageSize;
 
-            foreach (var result in pagedResult.Items)
+            foreach (var result in pagedResult)
             {
-                Add(result.ToEntity());
+                Add(result);
             }
         }
 
diff --git a/Tests/CosmosDB.EntityInterfaces/CosmosDB.EntityInterfaces.application.config b/Tests/CosmosDB.EntityInterfaces/CosmosDB.EntityInterfaces.application.config
index d6f531c446..c58b754751 100644
--- a/Tests/CosmosDB.EntityInterfaces/CosmosDB.EntityInterfaces.application.config
+++ b/Tests/CosmosDB.EntityInterfaces/CosmosDB.EntityInterfaces.application.config
@@ -55,6 +55,18 @@
         </setting>
       </settings>
     </group>
+    <group id="e9f6758c-f8db-4cad-af33-827b867be548" title="CosmosDb">
+      <module>Intent.CosmosDB</module>
+      <icon type="UrlImagePath" source="data:image/png;base64,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" />
+      <settings>
+        <setting id="fcb114f7-77b4-4c6a-96c0-41bb146f4166" title="Use Optimistic Concurrency" module="Intent.CosmosDB" type="switch">
+          <hint>Ensures updates are applied only when document etags match, for improved concurrency management</hint>
+          <value>false</value>
+          <isRequired>true</isRequired>
+          <options />
+        </setting>
+      </settings>
+    </group>
     <group id="2392c046-0aa7-4ee5-a77a-e954c4a7aab5" title="CQRS Settings">
       <module>Intent.Application.MediatR</module>
       <icon type="UrlImagePath" source="data:image/png;base64,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" />
diff --git a/Tests/CosmosDB.EntityInterfaces/modules.config b/Tests/CosmosDB.EntityInterfaces/modules.config
index df1db0c6a4..a2ab03bd05 100644
--- a/Tests/CosmosDB.EntityInterfaces/modules.config
+++ b/Tests/CosmosDB.EntityInterfaces/modules.config
@@ -11,7 +11,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
@@ -21,9 +21,9 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
-  <module moduleId="Intent.CosmosDB" version="1.0.3" />
+  <module moduleId="Intent.CosmosDB" version="1.0.4-pre.0" />
   <module moduleId="Intent.DocumentDB.Dtos.AutoMapper" version="1.0.0" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -33,12 +33,12 @@
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.4-pre.0" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/CosmosDB.PrivateSetters/CosmosDB.PrivateSetters.Infrastructure/CosmosDB.PrivateSetters.Infrastructure.csproj b/Tests/CosmosDB.PrivateSetters/CosmosDB.PrivateSetters.Infrastructure/CosmosDB.PrivateSetters.Infrastructure.csproj
index fc5fe95169..119f2321b5 100644
--- a/Tests/CosmosDB.PrivateSetters/CosmosDB.PrivateSetters.Infrastructure/CosmosDB.PrivateSetters.Infrastructure.csproj
+++ b/Tests/CosmosDB.PrivateSetters/CosmosDB.PrivateSetters.Infrastructure/CosmosDB.PrivateSetters.Infrastructure.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IEvangelist.Azure.CosmosRepository" Version="3.7.0" />
+    <PackageReference Include="IEvangelist.Azure.CosmosRepository" Version="8.1.2" />
     <PackageReference Include="Intent.RoslynWeaver.Attributes" Version="2.1.4" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
diff --git a/Tests/CosmosDB.PrivateSetters/CosmosDB.PrivateSetters.Infrastructure/Repositories/CosmosDBRepositoryBase.cs b/Tests/CosmosDB.PrivateSetters/CosmosDB.PrivateSetters.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
index 72b414dbab..907a7cd190 100644
--- a/Tests/CosmosDB.PrivateSetters/CosmosDB.PrivateSetters.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
+++ b/Tests/CosmosDB.PrivateSetters/CosmosDB.PrivateSetters.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
@@ -76,8 +76,7 @@ public void Remove(TDomain entity)
         public async Task<List<TDomain>> FindAllAsync(CancellationToken cancellationToken = default)
         {
             var documents = await _cosmosRepository.GetAsync(_ => true, cancellationToken);
-            var results = documents.Select(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -90,8 +89,7 @@ public async Task<List<TDomain>> FindAllAsync(CancellationToken cancellationToke
             try
             {
                 var document = await _cosmosRepository.GetAsync(id, partitionKey, cancellationToken: cancellationToken);
-                var entity = document.ToEntity();
-                Track(entity);
+                var entity = LoadAndTrackDocument(document);
 
                 return entity;
             }
@@ -106,8 +104,7 @@ public virtual async Task<List<TDomain>> FindAllAsync(
             CancellationToken cancellationToken = default)
         {
             var documents = await _cosmosRepository.GetAsync(AdaptFilterPredicate(filterExpression), cancellationToken);
-            var results = documents.Select(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -127,9 +124,12 @@ public virtual async Task<IPagedList<TDomain>> FindAllAsync(
             CancellationToken cancellationToken = default)
         {
             var pagedDocuments = await _cosmosRepository.PageAsync(AdaptFilterPredicate(filterExpression), pageNo, pageSize, true, cancellationToken);
-            Track(pagedDocuments.Items.Select(document => document.ToEntity()));
+            var entities = LoadAndTrackDocuments(pagedDocuments.Items).ToList();
 
-            return new CosmosPagedList<TDomain, TDocument>(pagedDocuments, pageNo, pageSize);
+            var totalCount = pagedDocuments.Total ?? 0;
+            var pageCount = pagedDocuments.TotalPages ?? 0;
+
+            return new CosmosPagedList<TDomain, TDocument>(entities, totalCount, pageCount, pageNo, pageSize);
         }
 
         public async Task<List<TDomain>> FindByIdsAsync(
@@ -139,8 +139,7 @@ public async Task<List<TDomain>> FindByIdsAsync(
             var queryDefinition = new QueryDefinition($"SELECT * from c WHERE ARRAY_CONTAINS(@ids, c.{_idFieldName})")
                 .WithParameter("@ids", ids);
             var documents = await _cosmosRepository.GetByQueryAsync(queryDefinition, cancellationToken);
-            var results = documents.Select(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -156,17 +155,21 @@ private static Expression<Func<TDocument, bool>> AdaptFilterPredicate(Expression
             return Expression.Lambda<Func<TDocument, bool>>(visitor.Visit(expression.Body)!, afterParameter);
         }
 
-        public void Track(IEnumerable<TDomain> items)
+        public TDomain LoadAndTrackDocument(TDocument document)
         {
-            foreach (var item in items)
-            {
-                _unitOfWork.Track(item);
-            }
+            var entity = document.ToEntity();
+
+            _unitOfWork.Track(entity);
+
+            return entity;
         }
 
-        public void Track(TDomain item)
+        public IEnumerable<TDomain> LoadAndTrackDocuments(IEnumerable<TDocument> documents)
         {
-            _unitOfWork.Track(item);
+            foreach (var document in documents)
+            {
+                yield return LoadAndTrackDocument(document);
+            }
         }
 
         private (string UserName, DateTimeOffset TimeStamp) GetAuditDetails()
diff --git a/Tests/CosmosDB.PrivateSetters/CosmosDB.PrivateSetters.Infrastructure/Repositories/CosmosPagedList.cs b/Tests/CosmosDB.PrivateSetters/CosmosDB.PrivateSetters.Infrastructure/Repositories/CosmosPagedList.cs
index a07d4036d6..d5f9ec7226 100644
--- a/Tests/CosmosDB.PrivateSetters/CosmosDB.PrivateSetters.Infrastructure/Repositories/CosmosPagedList.cs
+++ b/Tests/CosmosDB.PrivateSetters/CosmosDB.PrivateSetters.Infrastructure/Repositories/CosmosPagedList.cs
@@ -14,16 +14,16 @@ internal class CosmosPagedList<TDomain, TDocument> : List<TDomain>, IPagedList<T
         where TDomain : class
         where TDocument : ICosmosDBDocument<TDomain, TDocument>
     {
-        public CosmosPagedList(IPageQueryResult<TDocument> pagedResult, int pageNo, int pageSize)
+        public CosmosPagedList(IEnumerable<TDomain> pagedResult, int totalCount, int pageCount, int pageNo, int pageSize)
         {
-            TotalCount = pagedResult.Total ?? 0;
-            PageCount = pagedResult.TotalPages ?? 0;
+            TotalCount = totalCount;
+            PageCount = pageCount;
             PageNo = pageNo;
             PageSize = pageSize;
 
-            foreach (var result in pagedResult.Items)
+            foreach (var result in pagedResult)
             {
-                Add(result.ToEntity());
+                Add(result);
             }
         }
 
diff --git a/Tests/CosmosDB.PrivateSetters/CosmosDB.PrivateSetters.application.config b/Tests/CosmosDB.PrivateSetters/CosmosDB.PrivateSetters.application.config
index 7d471190bd..fb0970b275 100644
--- a/Tests/CosmosDB.PrivateSetters/CosmosDB.PrivateSetters.application.config
+++ b/Tests/CosmosDB.PrivateSetters/CosmosDB.PrivateSetters.application.config
@@ -55,6 +55,18 @@
         </setting>
       </settings>
     </group>
+    <group id="e9f6758c-f8db-4cad-af33-827b867be548" title="CosmosDb">
+      <module>Intent.CosmosDB</module>
+      <icon type="UrlImagePath" source="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAAAXNSR0IArs4c6QAAE8VJREFUeF7tXHl4VNXZ/7333lmzkY0lhEVIpCIEhNAGKGIolkVrrQqttlpcCKhVK0r1e2p1fKTWfi64VBS0aj+XWmNrWxZFahMUIgUEYgAxi2ExkIXsy2z3nvd77pCEyWSSuTMT9aly/kvmnHf53ffcdznvuYQzIyoEyOjqjR9PnShLvG/+hD2y0TXfhHmGAdxcMuU+JtxrqWuIyc097PomgGNER8MAvl1y3i4imsqaetWCSR+/boT4N2GOIQCZIW0+OKUajFQC/jNvwp6cbwI4RnQ0BODbJVMuI8JLAOIAnFSF9zsXZ5V8ZoTB131OSAA3F2fFsKx8AGAyAH2+m4jXzjt3721fd3CM6NcvgA4HpJwrzlsJ0N0ABnUTJNQR4555E/asM8Lk6zynTwCLjk23NTe5f0GEOwEM9geBCAzGcYAenDfhozVfZ4BC6RYUwLdLsi8gSdwIxhwAKf0QqQboTyxrzy44Z9/hUMy+jr/7ANxUlmGxiJgUr5cuZZaWEVEimIeAYDKgdBuAGgYOg7FGEuq2D7M+PukgCANr/+un0PrdU+0mKx9lQCLAAsAeiVYMCAI6APKAWAhzS/rCzHJ3JLT+m9bQ7t1TTSet6j2A/G0AWSAMAUPq9LjGdDllbcyMI8T4REi8uW18xprFlK8ZI/ClziI4HIQD4327L8kcGyOsprGKrMwB4zwiZDE4HUApGJsF09sNtvS9qN6rIn+RAIh7+INA0V8sGG0dkpx4G0l0pwQkMPrZxgQXMY6zwKr5WXtejAaGJS8WWNuHpMdZJK9ihI67hVvPXTS+w0EU8lWRccsmS7NmS9ScHhNJprMh0XKJcCkAQ7x0eXTjYInvVaWO9c1DLmqG4xTfPr3wpuIpObKCu5jx/T62dSuAPwqL6b6Fmf9pMaJ04JwlBZWDnO3OdJkUhTVxAUt0KwFnGaElgKdk0D815jrBSiNcH1XlL17cbfFpeevtgmPO0kAmAZ4hER4DSH9FRTWY8Q9Jlh+uFfadWJft7TcO3FyeNZhdih6m/ACA2Y9zGxGemXfunl+FK43DwdKn00vPhksbwbJ8AQE39YgxwyUIeMHYysAaTRPlO9+vVZztnMLM4wDcFyKKCJ/bqRUVYFxR99wFxSEzkU37J8+UIL0GYKTPlAEB5g/Y2jovXCfxs3fKMzRVmwngZwDlAhx1acwiEeJMEmQiWAhFleVt9n2lrVlNrV6px8uqX6j07chOgNsB0neTF2ALQKkAYoPuVOb/q2sasjQkgDrft0umOIhwFwArgBYwls6fuOcNo49vUcGBWLNTmSUEXwvQZQCiBk4PGYZZFcQqElItMhT9H52jpKJNVJ7oQHFFm+T29npFMoNbiGgHMR8ESAiwIKIWoaFRIq6TJLg1je1ENJpBSUQ4F0Bup/6n1VYwzBCABQfGx7phrQQjhYHPFkzYM9YweG/sSZXtsfcT+HzAJ8iAjNF2E0bGKJAouAoeVYjislZp864G4fJoBKJKFuIVidAmgGYN2oeNadsPwOEI6YSSlv77XInwewJd5C88g39qCEB90Tv7zysHaAyzeGTBxH2G3n2XvrV3kNVkf4GAHw0Ian5EZqXafNs21Nhf2cZlx51vfnSo+YU6NwrxUm5ExeDkvIJfEPP9RJTUxVMAvw0tQefsd0qmPA4Jt3i92sgfTC6uCiX4ZX89OMxill4BkZ4ODuiwS4Rvp9gM0xQCh9ya+McvZ47SiyIRjdRlBdeD8QCAYREBuLFk0mKZ5D8bORO55B9H02Ik5wYQzotI2hCL0q0yMuLDi0gEo6FDFU/dMXOUIxKZUpYV3kvM96BHXCzuMWyBbxRNtyXEqSnzJu461p8Ai94ossm2pG1EpINnmH5/NBWCb7t27VgTAVOTjFtgJ21m5mqN+fc354x6IlwQU/MKVgH4dY91GjIHRMFuosx05cay7SDOAUcHnkzASLsJI+ymbuD8hY9UcGb8p8PlWbpi9tgSoyCmLiuYz0yPEni8/xop3hMbqRy9eDsKWCntKP0nMxYYFSzYPF2gRLOMc+LNMPmFJtHQDLL2tZZGU97KeUPbQ9J1FCiDq/BLJjzsP5eJ3o9187wBA/DKjaWXg/n3AAyHOMGE1+O6yYMsPeK6kEpGNIEfdye67741M7PfilFKXmEuET8Dhp7ZdL0NBDQaV/fH3PIBAfAnb30ymkzSHwD0iJPC1asrOM6M888aw6VibL5g3sUarbxpxoitfa1IuPGDRLOqrgBBdx7+40MouKxuTW511ADque2h7NIHCL5MJaoMQ0/LpocRnhiDqu9ZBDzBUseqZdnjTgbO0osRXsTcAFCgw2kWrF1Y/9zcXfqaqAG8amPpZGb+XwAXRqvQVwDg5yDk5U0b8XYP2R0sDT6x9TvM/Cp6V4eeh4Lf6NY3MACuP3QbEz0arfXpwujvv+wkPd3+8gaBV1obG5+5Zt6kboeSmLclQWblT0T4YQ9JGFs08O0Nz8050PX/qCxw0cYDQ2Uh30dEywdC5RiZMC057PguWtbFMknX3jBt+N5OQpS69N8vgegaf8IMHBOgOxpK+S0U5qoDAuBPNhy8iCA/55/eRKPNl72FT/tU8f3lOaO26H+n5hW8CeDyAMvTo9qnTcD9x9fl9nhfRmWBV60/9FMmeiUa0PzXflUAksS/canuJ1e9UPUygy8Jok++JrCi4fnczwN/ixjARW9UJCh2VW/vuH+gANSFSbbImJAQXp4bPX9uevqtYw0n6t2jAAqMJDbKXvna6hfPrwvGJ2IAf7ypLIeE9hcC+SrVAzXsMmFiggU2RT8Y/HLGq1tO4NDRdv3gqOdg3u710sVNL+U29SVJxAA+u+PIhSRJ74ZS0SsYFa0e1Lg1/TjA0NC98dmxJsSZ5ejjrH44CsHIL6xByWd6b4D/IL1qfdAlmee0PTuztj+hv3AAu5g3eDQcbPFAFUZhPFWyHxWjnzxGLGafumuqwJad9dj9adADxU+FB5fWv5R7KNQTj1gyoxboL0CdS0NZmweeMEAMpUC4v+vb1O3SUFnWiqrDHcGW7/eo2g+bX5hrqP8xIgAdDoeUdOGSBRaTvCEcBTRmHG7z4pizO4wKZ3nUczWN0dLgwfGjHThR5exNj/GB14trml7KNdwoFT6ADpbSjheeff7kxNtys5PDDqCrOryobPdCNb6TowZOJ6CDV1XZjqoj7Whv791xEhtvKhUubf6RP8yuDIdh2ACm5L03hSDfnTnc9qOfL0gz3BrRJVSrV0NFmxdNvY8bw5E7rLn6tq041IKj5W0I9vYYkmbDqIyYNXazdFf+4nMDPUq/vMICMPGGf2XJkvwoAXMzhtuxZEFaWIrok1VmlOle2fXl9B3pzqL8k1YcqwxeOx2abkPGt+JhtUv3qB0Nj+UvnhFkb/etpmEABy/79yRmPAmQfr6LSAF0aQLlbV6cdA8cgCYiXwA+yCT1KP/vPNiEw9Uu1BzvfZIZZ5GQlRGH8eN08GS4POrVJwc1/2VddrY3HKswBGD8knczLWbTCwC+20U8UgB1R+LUGHp8qG+nEx1e1HuF4RgxULkYRUJmrAk2WYJZpu6AZ9OOkyipaEWrs/eDSksyY9bEQRiTHoMYW2fioSEnLyd9J1HP9rVQYIYEMC6vIMUCfp1AF/iXrMam2fDz+WmQoji30P2IxwemwO7G8HsxrTJhUoIVNv3YrnM0NLpQsK8JB460wxPEU40cYsVl3x2MQfEmKPrJVefQBCbdlDPi41CABf4eEsDUZYV/A4tLAnPEpASl8ubLRxVbJNL77KIebsH48KTx149ChGlJFljk0ynfzgNN2FrciDaXgBbEWwxLtuC6hWmwWXoXzr8QAFPyCl8l4EqAA4Cmj1flzc7W1M+vlSWsjRq9TgLhgKg3E323s/zvdKn4YF8j3t/fHFQUfZPkZiUgd5rebNV7uFR+xyVJS+/KSe9VbQmlW3ALdBQoKVX8WyK6tVdHEmF/3drciTrhZ3dVXQkWrxB8LcFRD42BI20eHDUQaA+3yBhlN+HwCSdef6/a9yoItr3sVhm3XjYCMfa+Iy6nV7tie9Wov+cvprA9W1AAU5e9dz4LepiI9L7p7sGggyfTZk/sam9d/eGxC8zEaxSJzokavU4CrarARw2h+38GexnlnzZj52dB0zHE22Ukxyi4euFwmE19P1/B6BCsXXxzzuiCSHToBWDKddvSSFEfAPi6AIIVHrl9WvMzFzd2/X/tbjZBO7YSRL+NhHmwNaEAbGnyQFUZe4rq+2Q5JNGM+dlJPi8r+zmKYAs6vCK/TeW7fjN7dFgZSBetHgCm315k87S7bmFIvwPY77Fxh6bxkoY/fi8/UIhndhy7nIgf0ZsRBwLEvgB0dahobVZRdrAZHUFSMZ13UpyCoUkWnD8pEemDQx9OaQKqKviaW2eM/HOksvcAMPX6LedBVp4GMN2foAA9aUHs/xxfl91rvzy0pSIhPt70kDxAB0uBAOp3Jxrq3Kj53InaapfP+gKHbmRpyRZMnzAI40baYTEbO55WNf6XS5XuvGNWenHUACb9dFO8bLffDOIHA4j9hYR2W+3zc2v6YvKHoiMXKzI9RERRdaDqOWutS8UnrR5fdbipwY36Gjfqalxobw1ewUmIUZB9dhzGDLNhVJrxO0Iewc0ujVeunDHyeYQZPPvj0G2BQ5YXTBCC/gZwpp/baCEhXVGbXvhef62wjoJKa4JFetaqSFdLUXhkPTspbnShutHjy11bm71oaQqeWckSYdKYGIw/Kw4Zw21QwjwCcAvx5vE2910PzT3bUN2vL+M5BaCjQEk+wRdJTH/vMZGxyqMojzU/M6vbcfRF6OH3P8uKtZqel4BpkWwHfWPurXVi+656uFwaWhr12wvBh1kCfjx3GIYmmZEQa+Q6X086GmNHi6bdcfeM0UWRyNrLAlOXFAyFid8EkX4FoXNwPTMtOflcruGi6YPbjs5KMtOLFGaHVkuLB68V1qLZraGtxdv7cMdP4itmpWJwkgVpqaGdRDBw3EI01TrVx2vjGh8Mt3AQjJ7PAofcsPUsIYlS/6tPDNwvx3sernlkXugeuk7KjoICRaOReWk20+8kovhQT7e8shVb9jX5Ev6Wjv6r1GdlxODCCYkYnmgJGZr0xVcwuF0V7x5p9ix+amFmRLerAmmfAvDGf40RmlzR80e+rW7dnCdDgRD4uw5imXP4WhK8hClIhqL3SFS24UhFOzwuEfKQafAwK8aOi4M9TkF2sg1xYb7ruuTTU+N2r/aRucU789aF/fcEhqOzD8CUG7eNI80bcAIVGYBdzK/cULoB4AuZYRYaw9nmxWeftqK2JnTVRQ9+4xIUX6FzUMrpQ/YpiVbE95NV9KU4A9zi1g79atboHi264QDV19xTFnh9wQQhI6BnOHIAU28qiJUFUibnJN3j6tCuL93fAq+BQxCLRYI9VsHYb8VhUHLv7oThVhlj4syG7od0KewV7Kzu8JatmjN20kAAFsYWxuNCEo/U19dXI//0LchgQgy5enOMsFvTBGtJMrMsmL5HEultH8lGhI6NU6CYJGSeE4eEIMD505iQYEayRTF0Uqyx+LSs1fvO6rkZvzQiB+7YMRWP5nxkaG7nJJ8FJuZ9MFKBdxdAPT4uweCXwbSJ2XcRr5Vl2amoQtIUWKEhVu68ZyWA0WC+tLP4YKg/zWTSt6kZskI+4OxxxsOR8fFmWGWpz+3s1tAqEXYddbp+bd+asdPRebc3JDC3Fx1DwvRRXcWSkPO7jvxTrtsWR4pXb9HteQ+imwLpDuwEgCYCKwAlADwYoLDLWCaFTg5KNsuJyebEoel2mK3G0q5AZWIVQpqtZ9cCAVqMIm1v84rCFs2zbvX3xoW8UeVHl7Ci6Djc2mw8PUuPSAyN7kzEZ4WsPg4a+HttALUyuFAC7YtNkE5kTU1WbDHKVJCvKb2/r4IYUkK/QcqM9wHslkje8NpFY/eEnZ7dvv0nIFoL5nexeuYio4xPFxOYKXX5+xnM6r2A9GPq76q/Aep6dw4R/gagECTahabsqH9+9iddS3/214PDhFmaA1AiE88G6AoDZE9PIagseDsBG0FUq6rqrvxLx38S+E0DQzSXvzccNuvfQdKUzirUYjw2o1flKRitXvXAocsLRqsqTQeJBUSk31Q//cWi/qU5CfBWAr/HJDWASYBoX93a2WWhlLhq/cFMZunUvTpZkoXgYQQxhogG86nvdemxz3ESVM0kyolJZf1DF0KriB8+fv+6bArrKLKHPLcXTQTodhDrVqdfrtbHITA9gdXTnw0lex8lfZaSPi9MU2QaIYQws4BCkjQGhKEEFqyhBhLrbV/dhxBMcJkkqok1OU+UP7UwdLDXl2TMdPXLH9vVBCmWlBirVxUmk9ohvFa5A+1WZ/6iMS1hb89AXit2joBQF0DCbDAmgJDR47sQ+neZCDVg7AXxTgjpn6g6VhwsGgl5KneKN9PoJYWWNsnkc5Wxwus93F7nDRXehHp6X9nvK7YtBCT9ZsGYgG9BBIqkX8bWDeVFWKyr8bspvbpUDQL4lan6xTB2vGFGU6Yd5JRA/GuAlnZ+2q+Ln568HICH5yGWnbDa3MAGV7CS3jcTwMDHcseHt0DwfaDOwJ9RgtUzsow8vTMAdqG0omg9mBeAqB2PzUgwAp4+5wyAXUjdWRwD0V4BgXvx+AzD30U8A6C/qa0oOgFv02iEEUWcAdDoXu1j3hkAzwAYJQJRLj9jgWcAjBKBKJefscAzAEaJQJTL/x/owZPu7GUDVwAAAABJRU5ErkJggg==" />
+      <settings>
+        <setting id="fcb114f7-77b4-4c6a-96c0-41bb146f4166" title="Use Optimistic Concurrency" module="Intent.CosmosDB" type="switch">
+          <hint>Ensures updates are applied only when document etags match, for improved concurrency management</hint>
+          <value>false</value>
+          <isRequired>true</isRequired>
+          <options />
+        </setting>
+      </settings>
+    </group>
     <group id="2392c046-0aa7-4ee5-a77a-e954c4a7aab5" title="CQRS Settings">
       <module>Intent.Application.MediatR</module>
       <icon type="UrlImagePath" source="data:image/png;base64,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" />
diff --git a/Tests/CosmosDB.PrivateSetters/modules.config b/Tests/CosmosDB.PrivateSetters/modules.config
index df1db0c6a4..a2ab03bd05 100644
--- a/Tests/CosmosDB.PrivateSetters/modules.config
+++ b/Tests/CosmosDB.PrivateSetters/modules.config
@@ -11,7 +11,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
@@ -21,9 +21,9 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
-  <module moduleId="Intent.CosmosDB" version="1.0.3" />
+  <module moduleId="Intent.CosmosDB" version="1.0.4-pre.0" />
   <module moduleId="Intent.DocumentDB.Dtos.AutoMapper" version="1.0.0" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -33,12 +33,12 @@
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.4-pre.0" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/CosmosDB.Infrastructure.csproj b/Tests/CosmosDB/CosmosDB.Infrastructure/CosmosDB.Infrastructure.csproj
index 15bf60ffba..f75bac9d8f 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/CosmosDB.Infrastructure.csproj
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/CosmosDB.Infrastructure.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IEvangelist.Azure.CosmosRepository" Version="3.7.0" />
+    <PackageReference Include="IEvangelist.Azure.CosmosRepository" Version="8.1.2" />
     <PackageReference Include="Intent.RoslynWeaver.Attributes" Version="2.1.4" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/BaseOfTDocument.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/BaseOfTDocument.cs
index 0708a076fd..cc7be66c82 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/BaseOfTDocument.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/BaseOfTDocument.cs
@@ -13,12 +13,15 @@ namespace CosmosDB.Infrastructure.Persistence.Documents
     internal abstract class BaseOfTDocument<T> : IBaseOfTDocument<T>, ICosmosDBDocument<BaseOfT<T>, BaseOfTDocument<T>>
     {
         private string? _type;
+        [JsonProperty("_etag")]
+        private string? _etag;
         [JsonProperty("type")]
         string IItem.Type
         {
             get => _type ??= GetType().GetNameForDocument();
             set => _type = value;
         }
+        string? IItemWithEtag.Etag => _etag;
         public string Id { get; set; } = default!;
         public T GenericAttribute { get; set; } = default!;
 
@@ -35,11 +38,13 @@ public BaseOfT<T> ToEntity(BaseOfT<T>? entity)
             return entity;
         }
 
-        public BaseOfTDocument<T> PopulateFromEntity(BaseOfT<T> entity)
+        public BaseOfTDocument<T> PopulateFromEntity(BaseOfT<T> entity, string? etag = null)
         {
             Id = entity.Id;
             GenericAttribute = entity.GenericAttribute;
 
+            _etag = etag;
+
             return this;
         }
     }
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/BaseTypeDocument.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/BaseTypeDocument.cs
index 945d2726bc..fdef0aea00 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/BaseTypeDocument.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/BaseTypeDocument.cs
@@ -15,6 +15,8 @@ namespace CosmosDB.Infrastructure.Persistence.Documents
     internal class BaseTypeDocument : IBaseTypeDocument, ICosmosDBDocument<BaseType, BaseTypeDocument>
     {
         private string? _type;
+        [JsonProperty("_etag")]
+        private string? _etag;
         public string Id { get; set; } = default!;
 
         public BaseType ToEntity(BaseType? entity = default)
@@ -31,22 +33,25 @@ string IItem.Type
             get => _type ??= GetType().GetNameForDocument();
             set => _type = value;
         }
+        string? IItemWithEtag.Etag => _etag;
 
-        public BaseTypeDocument PopulateFromEntity(BaseType entity)
+        public BaseTypeDocument PopulateFromEntity(BaseType entity, string? etag = null)
         {
             Id = entity.Id;
 
+            _etag = etag;
+
             return this;
         }
 
-        public static BaseTypeDocument? FromEntity(BaseType? entity)
+        public static BaseTypeDocument? FromEntity(BaseType? entity, string? etag = null)
         {
             if (entity is null)
             {
                 return null;
             }
 
-            return new BaseTypeDocument().PopulateFromEntity(entity);
+            return new BaseTypeDocument().PopulateFromEntity(entity, etag);
         }
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/CategoryDocument.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/CategoryDocument.cs
index c2882bbaf5..89371f2bd5 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/CategoryDocument.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/CategoryDocument.cs
@@ -13,12 +13,15 @@ namespace CosmosDB.Infrastructure.Persistence.Documents
     internal class CategoryDocument : ICategoryDocument, ICosmosDBDocument<Category, CategoryDocument>
     {
         private string? _type;
+        [JsonProperty("_etag")]
+        private string? _etag;
         [JsonProperty("type")]
         string IItem.Type
         {
             get => _type ??= GetType().GetNameForDocument();
             set => _type = value;
         }
+        string? IItemWithEtag.Etag => _etag;
         public string Id { get; set; } = default!;
         public string Name { get; set; } = default!;
 
@@ -32,22 +35,24 @@ public Category ToEntity(Category? entity = default)
             return entity;
         }
 
-        public CategoryDocument PopulateFromEntity(Category entity)
+        public CategoryDocument PopulateFromEntity(Category entity, string? etag = null)
         {
             Id = entity.Id;
             Name = entity.Name;
 
+            _etag = etag;
+
             return this;
         }
 
-        public static CategoryDocument? FromEntity(Category? entity)
+        public static CategoryDocument? FromEntity(Category? entity, string? etag = null)
         {
             if (entity is null)
             {
                 return null;
             }
 
-            return new CategoryDocument().PopulateFromEntity(entity);
+            return new CategoryDocument().PopulateFromEntity(entity, etag);
         }
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/ClassContainerDocument.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/ClassContainerDocument.cs
index 4b73083747..f32bb2fa7c 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/ClassContainerDocument.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/ClassContainerDocument.cs
@@ -15,6 +15,8 @@ namespace CosmosDB.Infrastructure.Persistence.Documents
     internal class ClassContainerDocument : IClassContainerDocument, ICosmosDBDocument<ClassContainer, ClassContainerDocument>
     {
         private string? _type;
+        [JsonProperty("_etag")]
+        private string? _etag;
         public string Id { get; set; } = default!;
         public string ClassPartitionKey { get; set; } = default!;
 
@@ -38,23 +40,26 @@ string IItem.Type
             get => ClassPartitionKey;
             set => ClassPartitionKey = value!;
         }
+        string? IItemWithEtag.Etag => _etag;
 
-        public ClassContainerDocument PopulateFromEntity(ClassContainer entity)
+        public ClassContainerDocument PopulateFromEntity(ClassContainer entity, string? etag = null)
         {
             Id = entity.Id;
             ClassPartitionKey = entity.ClassPartitionKey;
 
+            _etag = etag;
+
             return this;
         }
 
-        public static ClassContainerDocument? FromEntity(ClassContainer? entity)
+        public static ClassContainerDocument? FromEntity(ClassContainer? entity, string? etag = null)
         {
             if (entity is null)
             {
                 return null;
             }
 
-            return new ClassContainerDocument().PopulateFromEntity(entity);
+            return new ClassContainerDocument().PopulateFromEntity(entity, etag);
         }
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/ClientDocument.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/ClientDocument.cs
index 29c0c6bc6c..e6d2ac55d7 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/ClientDocument.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/ClientDocument.cs
@@ -16,6 +16,8 @@ namespace CosmosDB.Infrastructure.Persistence.Documents
     internal class ClientDocument : IClientDocument, ICosmosDBDocument<Client, ClientDocument>
     {
         private string? _type;
+        [JsonProperty("_etag")]
+        private string? _etag;
         [JsonProperty("id")]
         string IItem.Id
         {
@@ -28,6 +30,7 @@ string IItem.Type
             get => _type ??= GetType().GetNameForDocument();
             set => _type = value;
         }
+        string? IItemWithEtag.Etag => _etag;
         public string Identifier { get; set; } = default!;
         [JsonProperty("@type")]
         public ClientType Type { get; set; }
@@ -44,23 +47,25 @@ public Client ToEntity(Client? entity = default)
             return entity;
         }
 
-        public ClientDocument PopulateFromEntity(Client entity)
+        public ClientDocument PopulateFromEntity(Client entity, string? etag = null)
         {
             Identifier = entity.Identifier;
             Type = entity.Type;
             Name = entity.Name;
 
+            _etag = etag;
+
             return this;
         }
 
-        public static ClientDocument? FromEntity(Client? entity)
+        public static ClientDocument? FromEntity(Client? entity, string? etag = null)
         {
             if (entity is null)
             {
                 return null;
             }
 
-            return new ClientDocument().PopulateFromEntity(entity);
+            return new ClientDocument().PopulateFromEntity(entity, etag);
         }
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/CustomerDocument.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/CustomerDocument.cs
index d67eb224f2..150eec7bc2 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/CustomerDocument.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/CustomerDocument.cs
@@ -15,12 +15,15 @@ namespace CosmosDB.Infrastructure.Persistence.Documents
     internal class CustomerDocument : ICustomerDocument, ICosmosDBDocument<Customer, CustomerDocument>
     {
         private string? _type;
+        [JsonProperty("_etag")]
+        private string? _etag;
         [JsonProperty("type")]
         string IItem.Type
         {
             get => _type ??= GetType().GetNameForDocument();
             set => _type = value;
         }
+        string? IItemWithEtag.Etag => _etag;
         public string Id { get; set; } = default!;
         public string Name { get; set; } = default!;
         public List<string>? Tags { get; set; }
@@ -43,7 +46,7 @@ public Customer ToEntity(Customer? entity = default)
             return entity;
         }
 
-        public CustomerDocument PopulateFromEntity(Customer entity)
+        public CustomerDocument PopulateFromEntity(Customer entity, string? etag = null)
         {
             Id = entity.Id;
             Name = entity.Name;
@@ -51,17 +54,19 @@ public CustomerDocument PopulateFromEntity(Customer entity)
             DeliveryAddress = AddressDocument.FromEntity(entity.DeliveryAddress)!;
             BillingAddress = AddressDocument.FromEntity(entity.BillingAddress);
 
+            _etag = etag;
+
             return this;
         }
 
-        public static CustomerDocument? FromEntity(Customer? entity)
+        public static CustomerDocument? FromEntity(Customer? entity, string? etag = null)
         {
             if (entity is null)
             {
                 return null;
             }
 
-            return new CustomerDocument().PopulateFromEntity(entity);
+            return new CustomerDocument().PopulateFromEntity(entity, etag);
         }
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/DerivedOfTDocument.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/DerivedOfTDocument.cs
index 8a98c3362d..bc385ad56f 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/DerivedOfTDocument.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/DerivedOfTDocument.cs
@@ -3,6 +3,7 @@
 using CosmosDB.Domain.Repositories.Documents;
 using Intent.RoslynWeaver.Attributes;
 using Microsoft.Azure.CosmosRepository;
+using Newtonsoft.Json;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
 [assembly: IntentTemplate("Intent.CosmosDB.CosmosDBDocument", Version = "1.0")]
@@ -11,6 +12,9 @@ namespace CosmosDB.Infrastructure.Persistence.Documents
 {
     internal class DerivedOfTDocument : BaseOfTDocument<int>, IDerivedOfTDocument, ICosmosDBDocument<DerivedOfT, DerivedOfTDocument>
     {
+        [JsonProperty("_etag")]
+        private string? _etag;
+        string? IItemWithEtag.Etag => _etag;
         public string DerivedAttribute { get; set; } = default!;
 
         public DerivedOfT ToEntity(DerivedOfT? entity = default)
@@ -23,22 +27,24 @@ public DerivedOfT ToEntity(DerivedOfT? entity = default)
             return entity;
         }
 
-        public DerivedOfTDocument PopulateFromEntity(DerivedOfT entity)
+        public DerivedOfTDocument PopulateFromEntity(DerivedOfT entity, string? etag = null)
         {
             DerivedAttribute = entity.DerivedAttribute;
+
+            _etag = etag;
             base.PopulateFromEntity(entity);
 
             return this;
         }
 
-        public static DerivedOfTDocument? FromEntity(DerivedOfT? entity)
+        public static DerivedOfTDocument? FromEntity(DerivedOfT? entity, string? etag = null)
         {
             if (entity is null)
             {
                 return null;
             }
 
-            return new DerivedOfTDocument().PopulateFromEntity(entity);
+            return new DerivedOfTDocument().PopulateFromEntity(entity, etag);
         }
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/DerivedTypeAggregateDocument.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/DerivedTypeAggregateDocument.cs
index fb9cf40df8..3a0b3f89bf 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/DerivedTypeAggregateDocument.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/DerivedTypeAggregateDocument.cs
@@ -13,12 +13,15 @@ namespace CosmosDB.Infrastructure.Persistence.Documents
     internal class DerivedTypeAggregateDocument : IDerivedTypeAggregateDocument, ICosmosDBDocument<DerivedTypeAggregate, DerivedTypeAggregateDocument>
     {
         private string? _type;
+        [JsonProperty("_etag")]
+        private string? _etag;
         [JsonProperty("type")]
         string IItem.Type
         {
             get => _type ??= GetType().GetNameForDocument();
             set => _type = value;
         }
+        string? IItemWithEtag.Etag => _etag;
         public string Id { get; set; } = default!;
 
         public DerivedTypeAggregate ToEntity(DerivedTypeAggregate? entity = default)
@@ -30,21 +33,23 @@ public DerivedTypeAggregate ToEntity(DerivedTypeAggregate? entity = default)
             return entity;
         }
 
-        public DerivedTypeAggregateDocument PopulateFromEntity(DerivedTypeAggregate entity)
+        public DerivedTypeAggregateDocument PopulateFromEntity(DerivedTypeAggregate entity, string? etag = null)
         {
             Id = entity.Id;
 
+            _etag = etag;
+
             return this;
         }
 
-        public static DerivedTypeAggregateDocument? FromEntity(DerivedTypeAggregate? entity)
+        public static DerivedTypeAggregateDocument? FromEntity(DerivedTypeAggregate? entity, string? etag = null)
         {
             if (entity is null)
             {
                 return null;
             }
 
-            return new DerivedTypeAggregateDocument().PopulateFromEntity(entity);
+            return new DerivedTypeAggregateDocument().PopulateFromEntity(entity, etag);
         }
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/DerivedTypeDocument.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/DerivedTypeDocument.cs
index 66e6abb2f3..7579e9de4c 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/DerivedTypeDocument.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/DerivedTypeDocument.cs
@@ -12,6 +12,9 @@ namespace CosmosDB.Infrastructure.Persistence.Documents
 {
     internal class DerivedTypeDocument : BaseTypeDocument, IDerivedTypeDocument, ICosmosDBDocument<DerivedType, DerivedTypeDocument>
     {
+        [JsonProperty("_etag")]
+        private string? _etag;
+        string? IItemWithEtag.Etag => _etag;
         public string DerivedTypeAggregateId { get; set; } = default!;
         public DerivedType ToEntity(DerivedType? entity = default)
         {
@@ -23,22 +26,24 @@ public DerivedType ToEntity(DerivedType? entity = default)
             return entity;
         }
 
-        public DerivedTypeDocument PopulateFromEntity(DerivedType entity)
+        public DerivedTypeDocument PopulateFromEntity(DerivedType entity, string? etag = null)
         {
             DerivedTypeAggregateId = entity.DerivedTypeAggregateId;
+
+            _etag = etag;
             base.PopulateFromEntity(entity);
 
             return this;
         }
 
-        public static DerivedTypeDocument? FromEntity(DerivedType? entity)
+        public static DerivedTypeDocument? FromEntity(DerivedType? entity, string? etag = null)
         {
             if (entity is null)
             {
                 return null;
             }
 
-            return new DerivedTypeDocument().PopulateFromEntity(entity);
+            return new DerivedTypeDocument().PopulateFromEntity(entity, etag);
         }
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/EntityOfTDocument.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/EntityOfTDocument.cs
index 6ee1930369..0755ed28a9 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/EntityOfTDocument.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/EntityOfTDocument.cs
@@ -13,12 +13,15 @@ namespace CosmosDB.Infrastructure.Persistence.Documents
     internal class EntityOfTDocument<T> : IEntityOfTDocument<T>, ICosmosDBDocument<EntityOfT<T>, EntityOfTDocument<T>>
     {
         private string? _type;
+        [JsonProperty("_etag")]
+        private string? _etag;
         [JsonProperty("type")]
         string IItem.Type
         {
             get => _type ??= GetType().GetNameForDocument();
             set => _type = value;
         }
+        string? IItemWithEtag.Etag => _etag;
         public string Id { get; set; } = default!;
         public T GenericAttribute { get; set; } = default!;
 
@@ -32,22 +35,24 @@ public EntityOfT<T> ToEntity(EntityOfT<T>? entity = default)
             return entity;
         }
 
-        public EntityOfTDocument<T> PopulateFromEntity(EntityOfT<T> entity)
+        public EntityOfTDocument<T> PopulateFromEntity(EntityOfT<T> entity, string? etag = null)
         {
             Id = entity.Id;
             GenericAttribute = entity.GenericAttribute;
 
+            _etag = etag;
+
             return this;
         }
 
-        public static EntityOfTDocument<T>? FromEntity(EntityOfT<T>? entity)
+        public static EntityOfTDocument<T>? FromEntity(EntityOfT<T>? entity, string? etag = null)
         {
             if (entity is null)
             {
                 return null;
             }
 
-            return new EntityOfTDocument<T>().PopulateFromEntity(entity);
+            return new EntityOfTDocument<T>().PopulateFromEntity(entity, etag);
         }
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/Folder/FolderContainerDocument.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/Folder/FolderContainerDocument.cs
index f167e08412..1bc33dfb63 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/Folder/FolderContainerDocument.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/Folder/FolderContainerDocument.cs
@@ -15,6 +15,8 @@ namespace CosmosDB.Infrastructure.Persistence.Documents.Folder
     internal class FolderContainerDocument : IFolderContainerDocument, ICosmosDBDocument<FolderContainer, FolderContainerDocument>
     {
         private string? _type;
+        [JsonProperty("_etag")]
+        private string? _etag;
         public string Id { get; set; } = default!;
         public string FolderPartitionKey { get; set; } = default!;
 
@@ -38,23 +40,26 @@ string IItem.Type
             get => FolderPartitionKey;
             set => FolderPartitionKey = value!;
         }
+        string? IItemWithEtag.Etag => _etag;
 
-        public FolderContainerDocument PopulateFromEntity(FolderContainer entity)
+        public FolderContainerDocument PopulateFromEntity(FolderContainer entity, string? etag = null)
         {
             Id = entity.Id;
             FolderPartitionKey = entity.FolderPartitionKey;
 
+            _etag = etag;
+
             return this;
         }
 
-        public static FolderContainerDocument? FromEntity(FolderContainer? entity)
+        public static FolderContainerDocument? FromEntity(FolderContainer? entity, string? etag = null)
         {
             if (entity is null)
             {
                 return null;
             }
 
-            return new FolderContainerDocument().PopulateFromEntity(entity);
+            return new FolderContainerDocument().PopulateFromEntity(entity, etag);
         }
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/ICosmosDBDocument.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/ICosmosDBDocument.cs
index 285cb34eb1..36160a5557 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/ICosmosDBDocument.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/ICosmosDBDocument.cs
@@ -11,11 +11,11 @@ internal interface ICosmosDBDocument<TDomain, out TDocument> : ICosmosDBDocument
         where TDomain : class
         where TDocument : ICosmosDBDocument<TDomain, TDocument>
     {
-        TDocument PopulateFromEntity(TDomain entity);
+        TDocument PopulateFromEntity(TDomain entity, string? etag = null);
         TDomain ToEntity(TDomain? entity = null);
     }
 
-    internal interface ICosmosDBDocument : IItem
+    internal interface ICosmosDBDocument : IItemWithEtag
     {
         string IItem.PartitionKey => PartitionKey!;
         new string? PartitionKey
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/IdTestingDocument.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/IdTestingDocument.cs
index e9338aef3c..83dad42096 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/IdTestingDocument.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/IdTestingDocument.cs
@@ -15,6 +15,8 @@ namespace CosmosDB.Infrastructure.Persistence.Documents
     internal class IdTestingDocument : IIdTestingDocument, ICosmosDBDocument<IdTesting, IdTestingDocument>
     {
         private string? _type;
+        [JsonProperty("_etag")]
+        private string? _etag;
         [JsonProperty("id")]
         string IItem.Id
         {
@@ -27,6 +29,7 @@ string IItem.Type
             get => _type ??= GetType().GetNameForDocument();
             set => _type = value;
         }
+        string? IItemWithEtag.Etag => _etag;
         public string Identifier { get; set; } = default!;
         [JsonProperty("@id")]
         public string Id { get; set; } = default!;
@@ -41,22 +44,24 @@ public IdTesting ToEntity(IdTesting? entity = default)
             return entity;
         }
 
-        public IdTestingDocument PopulateFromEntity(IdTesting entity)
+        public IdTestingDocument PopulateFromEntity(IdTesting entity, string? etag = null)
         {
             Identifier = entity.Identifier;
             Id = entity.Id;
 
+            _etag = etag;
+
             return this;
         }
 
-        public static IdTestingDocument? FromEntity(IdTesting? entity)
+        public static IdTestingDocument? FromEntity(IdTesting? entity, string? etag = null)
         {
             if (entity is null)
             {
                 return null;
             }
 
-            return new IdTestingDocument().PopulateFromEntity(entity);
+            return new IdTestingDocument().PopulateFromEntity(entity, etag);
         }
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/InvoiceDocument.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/InvoiceDocument.cs
index d22b170a5c..ccf0b9700f 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/InvoiceDocument.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/InvoiceDocument.cs
@@ -17,6 +17,8 @@ namespace CosmosDB.Infrastructure.Persistence.Documents
     internal class InvoiceDocument : IInvoiceDocument, ICosmosDBDocument<Invoice, InvoiceDocument>
     {
         private string? _type;
+        [JsonProperty("_etag")]
+        private string? _etag;
         public string Id { get; set; } = default!;
         public string ClientIdentifier { get; set; } = default!;
         public DateTime Date { get; set; }
@@ -53,8 +55,9 @@ string IItem.Type
             get => _type ??= GetType().GetNameForDocument();
             set => _type = value;
         }
+        string? IItemWithEtag.Etag => _etag;
 
-        public InvoiceDocument PopulateFromEntity(Invoice entity)
+        public InvoiceDocument PopulateFromEntity(Invoice entity, string? etag = null)
         {
             Id = entity.Id;
             ClientIdentifier = entity.ClientIdentifier;
@@ -67,17 +70,19 @@ public InvoiceDocument PopulateFromEntity(Invoice entity)
             LineItems = entity.LineItems.Select(x => LineItemDocument.FromEntity(x)!).ToList();
             InvoiceLogo = InvoiceLogoDocument.FromEntity(entity.InvoiceLogo)!;
 
+            _etag = etag;
+
             return this;
         }
 
-        public static InvoiceDocument? FromEntity(Invoice? entity)
+        public static InvoiceDocument? FromEntity(Invoice? entity, string? etag = null)
         {
             if (entity is null)
             {
                 return null;
             }
 
-            return new InvoiceDocument().PopulateFromEntity(entity);
+            return new InvoiceDocument().PopulateFromEntity(entity, etag);
         }
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/NonStringPartitionKeyDocument.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/NonStringPartitionKeyDocument.cs
index 1a29aac758..592cb9417b 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/NonStringPartitionKeyDocument.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/NonStringPartitionKeyDocument.cs
@@ -14,6 +14,8 @@ namespace CosmosDB.Infrastructure.Persistence.Documents
     internal class NonStringPartitionKeyDocument : INonStringPartitionKeyDocument, ICosmosDBDocument<NonStringPartitionKey, NonStringPartitionKeyDocument>
     {
         private string? _type;
+        [JsonProperty("_etag")]
+        private string? _etag;
         [JsonProperty("type")]
         string IItem.Type
         {
@@ -25,6 +27,7 @@ string IItem.Type
             get => PartInt;
             set => PartInt = value!;
         }
+        string? IItemWithEtag.Etag => _etag;
         public string Id { get; set; } = default!;
         public string PartInt { get; set; }
         public string Name { get; set; } = default!;
@@ -40,23 +43,25 @@ public NonStringPartitionKey ToEntity(NonStringPartitionKey? entity = default)
             return entity;
         }
 
-        public NonStringPartitionKeyDocument PopulateFromEntity(NonStringPartitionKey entity)
+        public NonStringPartitionKeyDocument PopulateFromEntity(NonStringPartitionKey entity, string? etag = null)
         {
             Id = entity.Id;
             PartInt = entity.PartInt.ToString(CultureInfo.InvariantCulture);
             Name = entity.Name;
 
+            _etag = etag;
+
             return this;
         }
 
-        public static NonStringPartitionKeyDocument? FromEntity(NonStringPartitionKey? entity)
+        public static NonStringPartitionKeyDocument? FromEntity(NonStringPartitionKey? entity, string? etag = null)
         {
             if (entity is null)
             {
                 return null;
             }
 
-            return new NonStringPartitionKeyDocument().PopulateFromEntity(entity);
+            return new NonStringPartitionKeyDocument().PopulateFromEntity(entity, etag);
         }
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/OrderDocument.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/OrderDocument.cs
index 7dca1085bb..2cd008468f 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/OrderDocument.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/OrderDocument.cs
@@ -15,6 +15,8 @@ namespace CosmosDB.Infrastructure.Persistence.Documents
     internal class OrderDocument : IOrderDocument, ICosmosDBDocument<Order, OrderDocument>
     {
         private string? _type;
+        [JsonProperty("_etag")]
+        private string? _etag;
         [JsonProperty("type")]
         string IItem.Type
         {
@@ -26,6 +28,7 @@ string IItem.Type
             get => WarehouseId;
             set => WarehouseId = value!;
         }
+        string? IItemWithEtag.Etag => _etag;
         public string Id { get; set; } = default!;
         public string WarehouseId { get; set; } = default!;
         public string RefNo { get; set; } = default!;
@@ -46,7 +49,7 @@ public Order ToEntity(Order? entity = default)
             return entity;
         }
 
-        public OrderDocument PopulateFromEntity(Order entity)
+        public OrderDocument PopulateFromEntity(Order entity, string? etag = null)
         {
             Id = entity.Id;
             WarehouseId = entity.WarehouseId;
@@ -54,17 +57,19 @@ public OrderDocument PopulateFromEntity(Order entity)
             OrderDate = entity.OrderDate;
             OrderItems = entity.OrderItems.Select(x => OrderItemDocument.FromEntity(x)!).ToList();
 
+            _etag = etag;
+
             return this;
         }
 
-        public static OrderDocument? FromEntity(Order? entity)
+        public static OrderDocument? FromEntity(Order? entity, string? etag = null)
         {
             if (entity is null)
             {
                 return null;
             }
 
-            return new OrderDocument().PopulateFromEntity(entity);
+            return new OrderDocument().PopulateFromEntity(entity, etag);
         }
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/PackageContainerDocument.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/PackageContainerDocument.cs
index c09724a59b..5af5557c76 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/PackageContainerDocument.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/PackageContainerDocument.cs
@@ -15,6 +15,8 @@ namespace CosmosDB.Infrastructure.Persistence.Documents
     internal class PackageContainerDocument : IPackageContainerDocument, ICosmosDBDocument<PackageContainer, PackageContainerDocument>
     {
         private string? _type;
+        [JsonProperty("_etag")]
+        private string? _etag;
         public string Id { get; set; } = default!;
         public string PackagePartitionKey { get; set; } = default!;
 
@@ -38,23 +40,26 @@ string IItem.Type
             get => PackagePartitionKey;
             set => PackagePartitionKey = value!;
         }
+        string? IItemWithEtag.Etag => _etag;
 
-        public PackageContainerDocument PopulateFromEntity(PackageContainer entity)
+        public PackageContainerDocument PopulateFromEntity(PackageContainer entity, string? etag = null)
         {
             Id = entity.Id;
             PackagePartitionKey = entity.PackagePartitionKey;
 
+            _etag = etag;
+
             return this;
         }
 
-        public static PackageContainerDocument? FromEntity(PackageContainer? entity)
+        public static PackageContainerDocument? FromEntity(PackageContainer? entity, string? etag = null)
         {
             if (entity is null)
             {
                 return null;
             }
 
-            return new PackageContainerDocument().PopulateFromEntity(entity);
+            return new PackageContainerDocument().PopulateFromEntity(entity, etag);
         }
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/ProductDocument.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/ProductDocument.cs
index 284676bbae..25a36845e5 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/ProductDocument.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/ProductDocument.cs
@@ -15,12 +15,15 @@ namespace CosmosDB.Infrastructure.Persistence.Documents
     internal class ProductDocument : IProductDocument, ICosmosDBDocument<Product, ProductDocument>
     {
         private string? _type;
+        [JsonProperty("_etag")]
+        private string? _etag;
         [JsonProperty("type")]
         string IItem.Type
         {
             get => _type ??= GetType().GetNameForDocument();
             set => _type = value;
         }
+        string? IItemWithEtag.Etag => _etag;
         public string Id { get; set; } = default!;
         public string Name { get; set; } = default!;
         public List<string> CategoriesIds { get; set; } = default!;
@@ -37,23 +40,25 @@ public Product ToEntity(Product? entity = default)
             return entity;
         }
 
-        public ProductDocument PopulateFromEntity(Product entity)
+        public ProductDocument PopulateFromEntity(Product entity, string? etag = null)
         {
             Id = entity.Id;
             Name = entity.Name;
             CategoriesIds = entity.CategoriesIds.ToList();
 
+            _etag = etag;
+
             return this;
         }
 
-        public static ProductDocument? FromEntity(Product? entity)
+        public static ProductDocument? FromEntity(Product? entity, string? etag = null)
         {
             if (entity is null)
             {
                 return null;
             }
 
-            return new ProductDocument().PopulateFromEntity(entity);
+            return new ProductDocument().PopulateFromEntity(entity, etag);
         }
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/RegionDocument.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/RegionDocument.cs
index 81fb5dd6d8..6c012d00f3 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/RegionDocument.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/RegionDocument.cs
@@ -16,6 +16,8 @@ namespace CosmosDB.Infrastructure.Persistence.Documents
     internal class RegionDocument : IRegionDocument, ICosmosDBDocument<Region, RegionDocument>
     {
         private string? _type;
+        [JsonProperty("_etag")]
+        private string? _etag;
         public string Id { get; set; } = default!;
         public string Name { get; set; } = default!;
         public List<CountryDocument> Countries { get; set; } = default!;
@@ -37,24 +39,27 @@ string IItem.Type
             get => _type ??= GetType().GetNameForDocument();
             set => _type = value;
         }
+        string? IItemWithEtag.Etag => _etag;
 
-        public RegionDocument PopulateFromEntity(Region entity)
+        public RegionDocument PopulateFromEntity(Region entity, string? etag = null)
         {
             Id = entity.Id;
             Name = entity.Name;
             Countries = entity.Countries.Select(x => CountryDocument.FromEntity(x)!).ToList();
 
+            _etag = etag;
+
             return this;
         }
 
-        public static RegionDocument? FromEntity(Region? entity)
+        public static RegionDocument? FromEntity(Region? entity, string? etag = null)
         {
             if (entity is null)
             {
                 return null;
             }
 
-            return new RegionDocument().PopulateFromEntity(entity);
+            return new RegionDocument().PopulateFromEntity(entity, etag);
         }
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/WithoutPartitionKeyDocument.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/WithoutPartitionKeyDocument.cs
index 367fe14f6b..9e65947cee 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/WithoutPartitionKeyDocument.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Persistence/Documents/WithoutPartitionKeyDocument.cs
@@ -15,6 +15,8 @@ namespace CosmosDB.Infrastructure.Persistence.Documents
     internal class WithoutPartitionKeyDocument : IWithoutPartitionKeyDocument, ICosmosDBDocument<WithoutPartitionKey, WithoutPartitionKeyDocument>
     {
         private string? _type;
+        [JsonProperty("_etag")]
+        private string? _etag;
         public string Id { get; set; } = default!;
 
         public WithoutPartitionKey ToEntity(WithoutPartitionKey? entity = default)
@@ -31,22 +33,25 @@ string IItem.Type
             get => _type ??= GetType().GetNameForDocument();
             set => _type = value;
         }
+        string? IItemWithEtag.Etag => _etag;
 
-        public WithoutPartitionKeyDocument PopulateFromEntity(WithoutPartitionKey entity)
+        public WithoutPartitionKeyDocument PopulateFromEntity(WithoutPartitionKey entity, string? etag = null)
         {
             Id = entity.Id;
 
+            _etag = etag;
+
             return this;
         }
 
-        public static WithoutPartitionKeyDocument? FromEntity(WithoutPartitionKey? entity)
+        public static WithoutPartitionKeyDocument? FromEntity(WithoutPartitionKey? entity, string? etag = null)
         {
             if (entity is null)
             {
                 return null;
             }
 
-            return new WithoutPartitionKeyDocument().PopulateFromEntity(entity);
+            return new WithoutPartitionKeyDocument().PopulateFromEntity(entity, etag);
         }
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/BaseTypeCosmosDBRepository.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/BaseTypeCosmosDBRepository.cs
index 971060a190..3d77366478 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/BaseTypeCosmosDBRepository.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/BaseTypeCosmosDBRepository.cs
@@ -23,5 +23,7 @@ public BaseTypeCosmosDBRepository(CosmosDBUnitOfWork unitOfWork,
         }
 
         public async Task<BaseType?> FindByIdAsync(string id, CancellationToken cancellationToken = default) => await base.FindByIdAsync(id: id, cancellationToken: cancellationToken);
+
+        public override string GetId(BaseType entity) => entity.Id;
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/CategoryCosmosDBRepository.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/CategoryCosmosDBRepository.cs
index 9aaa26d290..36d3c51376 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/CategoryCosmosDBRepository.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/CategoryCosmosDBRepository.cs
@@ -23,5 +23,7 @@ public CategoryCosmosDBRepository(CosmosDBUnitOfWork unitOfWork,
         }
 
         public async Task<Category?> FindByIdAsync(string id, CancellationToken cancellationToken = default) => await base.FindByIdAsync(id: id, cancellationToken: cancellationToken);
+
+        public override string GetId(Category entity) => entity.Id;
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/ClassContainerCosmosDBRepository.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/ClassContainerCosmosDBRepository.cs
index acbea328f0..aa6e31a103 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/ClassContainerCosmosDBRepository.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/ClassContainerCosmosDBRepository.cs
@@ -25,5 +25,7 @@ public ClassContainerCosmosDBRepository(CosmosDBUnitOfWork unitOfWork,
         public async Task<ClassContainer?> FindByIdAsync(
             (string Id, string ClassPartitionKey) id,
             CancellationToken cancellationToken = default) => await base.FindByIdAsync(id: id.Id, partitionKey: id.ClassPartitionKey, cancellationToken: cancellationToken);
+
+        public override string GetId(ClassContainer entity) => entity.Id;
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/ClientCosmosDBRepository.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/ClientCosmosDBRepository.cs
index 1d8879a47f..b7efccfe56 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/ClientCosmosDBRepository.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/ClientCosmosDBRepository.cs
@@ -23,5 +23,7 @@ public ClientCosmosDBRepository(CosmosDBUnitOfWork unitOfWork,
         }
 
         public async Task<Client?> FindByIdAsync(string id, CancellationToken cancellationToken = default) => await base.FindByIdAsync(id: id, cancellationToken: cancellationToken);
+
+        public override string GetId(Client entity) => entity.Identifier;
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/CosmosDBRepositoryBase.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
index 28f2ebf6f1..0369d556cb 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
@@ -23,6 +23,7 @@ internal abstract class CosmosDBRepositoryBase<TDomain, TDocument, TDocumentInte
         where TDomain : class
         where TDocument : ICosmosDBDocument<TDomain, TDocument>, TDocumentInterface, new()
     {
+        private Dictionary<string, string?> _etags;
         private readonly CosmosDBUnitOfWork _unitOfWork;
         private readonly Microsoft.Azure.CosmosRepository.IRepository<TDocument> _cosmosRepository;
         private readonly string _idFieldName;
@@ -37,12 +38,15 @@ protected CosmosDBRepositoryBase(CosmosDBUnitOfWork unitOfWork,
             _unitOfWork = unitOfWork;
             _cosmosRepository = cosmosRepository;
             _idFieldName = idFieldName;
+            _etags = new Dictionary<string, string?>();
             _currentUserService = currentUserService;
             _auditDetails = new Lazy<(string UserName, DateTimeOffset TimeStamp)>(GetAuditDetails);
         }
 
         public ICosmosDBUnitOfWork UnitOfWork => _unitOfWork;
 
+        public abstract string GetId(TDomain entity);
+
         public void Add(TDomain entity)
         {
             _unitOfWork.Track(entity);
@@ -59,7 +63,7 @@ public void Update(TDomain entity)
             _unitOfWork.Enqueue(async cancellationToken =>
             {
                 (entity as IAuditable)?.SetUpdated(_auditDetails.Value.UserName, _auditDetails.Value.TimeStamp);
-                var document = new TDocument().PopulateFromEntity(entity);
+                var document = new TDocument().PopulateFromEntity(entity, GetEtag(entity));
                 await _cosmosRepository.UpdateAsync(document, cancellationToken: cancellationToken);
             });
         }
@@ -68,7 +72,7 @@ public void Remove(TDomain entity)
         {
             _unitOfWork.Enqueue(async cancellationToken =>
             {
-                var document = new TDocument().PopulateFromEntity(entity);
+                var document = new TDocument().PopulateFromEntity(entity, GetEtag(entity));
                 await _cosmosRepository.DeleteAsync(document, cancellationToken: cancellationToken);
             });
         }
@@ -76,8 +80,7 @@ public void Remove(TDomain entity)
         public async Task<List<TDomain>> FindAllAsync(CancellationToken cancellationToken = default)
         {
             var documents = await _cosmosRepository.GetAsync(_ => true, cancellationToken);
-            var results = documents.Select(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -90,8 +93,7 @@ public async Task<List<TDomain>> FindAllAsync(CancellationToken cancellationToke
             try
             {
                 var document = await _cosmosRepository.GetAsync(id, partitionKey, cancellationToken: cancellationToken);
-                var entity = document.ToEntity();
-                Track(entity);
+                var entity = LoadAndTrackDocument(document);
 
                 return entity;
             }
@@ -106,8 +108,7 @@ public virtual async Task<List<TDomain>> FindAllAsync(
             CancellationToken cancellationToken = default)
         {
             var documents = await _cosmosRepository.GetAsync(AdaptFilterPredicate(filterExpression), cancellationToken);
-            var results = documents.Select(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -127,9 +128,12 @@ public virtual async Task<IPagedList<TDomain>> FindAllAsync(
             CancellationToken cancellationToken = default)
         {
             var pagedDocuments = await _cosmosRepository.PageAsync(AdaptFilterPredicate(filterExpression), pageNo, pageSize, true, cancellationToken);
-            Track(pagedDocuments.Items.Select(document => document.ToEntity()));
+            var entities = LoadAndTrackDocuments(pagedDocuments.Items).ToList();
+
+            var totalCount = pagedDocuments.Total ?? 0;
+            var pageCount = pagedDocuments.TotalPages ?? 0;
 
-            return new CosmosPagedList<TDomain, TDocument>(pagedDocuments, pageNo, pageSize);
+            return new CosmosPagedList<TDomain, TDocument>(entities, totalCount, pageCount, pageNo, pageSize);
         }
 
         public async Task<List<TDomain>> FindByIdsAsync(
@@ -139,8 +143,7 @@ public async Task<List<TDomain>> FindByIdsAsync(
             var queryDefinition = new QueryDefinition($"SELECT * from c WHERE ARRAY_CONTAINS(@ids, c.{_idFieldName})")
                 .WithParameter("@ids", ids);
             var documents = await _cosmosRepository.GetByQueryAsync(queryDefinition, cancellationToken);
-            var results = documents.Select(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -156,17 +159,32 @@ private static Expression<Func<TDocument, bool>> AdaptFilterPredicate(Expression
             return Expression.Lambda<Func<TDocument, bool>>(visitor.Visit(expression.Body)!, afterParameter);
         }
 
-        public void Track(IEnumerable<TDomain> items)
+        public TDomain LoadAndTrackDocument(TDocument document)
         {
-            foreach (var item in items)
+            var entity = document.ToEntity();
+
+            _unitOfWork.Track(entity);
+            _etags[document.Id] = document.Etag;
+
+            return entity;
+        }
+
+        public IEnumerable<TDomain> LoadAndTrackDocuments(IEnumerable<TDocument> documents)
+        {
+            foreach (var document in documents)
             {
-                _unitOfWork.Track(item);
+                yield return LoadAndTrackDocument(document);
             }
         }
 
-        public void Track(TDomain item)
+        public string? GetEtag(TDomain entity)
         {
-            _unitOfWork.Track(item);
+            if (_etags.TryGetValue(GetId(entity), out var etag))
+            {
+                return etag;
+            }
+
+            return default;
         }
 
         private (string UserName, DateTimeOffset TimeStamp) GetAuditDetails()
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/CosmosPagedList.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/CosmosPagedList.cs
index 89c6bb0489..cbd58144a1 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/CosmosPagedList.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/CosmosPagedList.cs
@@ -14,16 +14,16 @@ internal class CosmosPagedList<TDomain, TDocument> : List<TDomain>, IPagedList<T
         where TDomain : class
         where TDocument : ICosmosDBDocument<TDomain, TDocument>
     {
-        public CosmosPagedList(IPageQueryResult<TDocument> pagedResult, int pageNo, int pageSize)
+        public CosmosPagedList(IEnumerable<TDomain> pagedResult, int totalCount, int pageCount, int pageNo, int pageSize)
         {
-            TotalCount = pagedResult.Total ?? 0;
-            PageCount = pagedResult.TotalPages ?? 0;
+            TotalCount = totalCount;
+            PageCount = pageCount;
             PageNo = pageNo;
             PageSize = pageSize;
 
-            foreach (var result in pagedResult.Items)
+            foreach (var result in pagedResult)
             {
-                Add(result.ToEntity());
+                Add(result);
             }
         }
 
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/CustomerCosmosDBRepository.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/CustomerCosmosDBRepository.cs
index 15e0f18737..5df0c3293e 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/CustomerCosmosDBRepository.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/CustomerCosmosDBRepository.cs
@@ -23,5 +23,7 @@ public CustomerCosmosDBRepository(CosmosDBUnitOfWork unitOfWork,
         }
 
         public async Task<Customer?> FindByIdAsync(string id, CancellationToken cancellationToken = default) => await base.FindByIdAsync(id: id, cancellationToken: cancellationToken);
+
+        public override string GetId(Customer entity) => entity.Id;
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/DerivedOfTCosmosDBRepository.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/DerivedOfTCosmosDBRepository.cs
index 77a5afb35b..29a9f1c9d2 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/DerivedOfTCosmosDBRepository.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/DerivedOfTCosmosDBRepository.cs
@@ -23,5 +23,7 @@ public DerivedOfTCosmosDBRepository(CosmosDBUnitOfWork unitOfWork,
         }
 
         public async Task<DerivedOfT?> FindByIdAsync(string id, CancellationToken cancellationToken = default) => await base.FindByIdAsync(id: id, cancellationToken: cancellationToken);
+
+        public override string GetId(DerivedOfT entity) => entity.Id;
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/DerivedTypeAggregateCosmosDBRepository.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/DerivedTypeAggregateCosmosDBRepository.cs
index adeaa461e6..5c7aa3897f 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/DerivedTypeAggregateCosmosDBRepository.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/DerivedTypeAggregateCosmosDBRepository.cs
@@ -23,5 +23,7 @@ public DerivedTypeAggregateCosmosDBRepository(CosmosDBUnitOfWork unitOfWork,
         }
 
         public async Task<DerivedTypeAggregate?> FindByIdAsync(string id, CancellationToken cancellationToken = default) => await base.FindByIdAsync(id: id, cancellationToken: cancellationToken);
+
+        public override string GetId(DerivedTypeAggregate entity) => entity.Id;
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/DerivedTypeCosmosDBRepository.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/DerivedTypeCosmosDBRepository.cs
index 1cd96403c3..8ffc840787 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/DerivedTypeCosmosDBRepository.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/DerivedTypeCosmosDBRepository.cs
@@ -23,5 +23,7 @@ public DerivedTypeCosmosDBRepository(CosmosDBUnitOfWork unitOfWork,
         }
 
         public async Task<DerivedType?> FindByIdAsync(string id, CancellationToken cancellationToken = default) => await base.FindByIdAsync(id: id, cancellationToken: cancellationToken);
+
+        public override string GetId(DerivedType entity) => entity.Id;
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/EntityOfTCosmosDBRepository.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/EntityOfTCosmosDBRepository.cs
index 4c2ada8786..8b2415ffe7 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/EntityOfTCosmosDBRepository.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/EntityOfTCosmosDBRepository.cs
@@ -23,5 +23,7 @@ public EntityOfTCosmosDBRepository(CosmosDBUnitOfWork unitOfWork,
         }
 
         public async Task<EntityOfT<T>?> FindByIdAsync(string id, CancellationToken cancellationToken = default) => await base.FindByIdAsync(id: id, cancellationToken: cancellationToken);
+
+        public override string GetId(EntityOfT<T> entity) => entity.Id;
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/Folder/FolderContainerCosmosDBRepository.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/Folder/FolderContainerCosmosDBRepository.cs
index 8bbf003c0d..d594ca4c30 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/Folder/FolderContainerCosmosDBRepository.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/Folder/FolderContainerCosmosDBRepository.cs
@@ -25,5 +25,7 @@ public FolderContainerCosmosDBRepository(CosmosDBUnitOfWork unitOfWork,
         public async Task<FolderContainer?> FindByIdAsync(
             (string Id, string FolderPartitionKey) id,
             CancellationToken cancellationToken = default) => await base.FindByIdAsync(id: id.Id, partitionKey: id.FolderPartitionKey, cancellationToken: cancellationToken);
+
+        public override string GetId(FolderContainer entity) => entity.Id;
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/IdTestingCosmosDBRepository.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/IdTestingCosmosDBRepository.cs
index 109fc453b9..87cdd8ddd1 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/IdTestingCosmosDBRepository.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/IdTestingCosmosDBRepository.cs
@@ -23,5 +23,7 @@ public IdTestingCosmosDBRepository(CosmosDBUnitOfWork unitOfWork,
         }
 
         public async Task<IdTesting?> FindByIdAsync(string id, CancellationToken cancellationToken = default) => await base.FindByIdAsync(id: id, cancellationToken: cancellationToken);
+
+        public override string GetId(IdTesting entity) => entity.Identifier;
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/InvoiceCosmosDBRepository.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/InvoiceCosmosDBRepository.cs
index 8f2b04020a..ebbd18ff08 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/InvoiceCosmosDBRepository.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/InvoiceCosmosDBRepository.cs
@@ -23,5 +23,7 @@ public InvoiceCosmosDBRepository(CosmosDBUnitOfWork unitOfWork,
         }
 
         public async Task<Invoice?> FindByIdAsync(string id, CancellationToken cancellationToken = default) => await base.FindByIdAsync(id: id, cancellationToken: cancellationToken);
+
+        public override string GetId(Invoice entity) => entity.Id;
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/NonStringPartitionKeyCosmosDBRepository.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/NonStringPartitionKeyCosmosDBRepository.cs
index 6afa7cc3df..655101fc82 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/NonStringPartitionKeyCosmosDBRepository.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/NonStringPartitionKeyCosmosDBRepository.cs
@@ -26,5 +26,7 @@ public NonStringPartitionKeyCosmosDBRepository(CosmosDBUnitOfWork unitOfWork,
         public async Task<NonStringPartitionKey?> FindByIdAsync(
             (string Id, int PartInt) id,
             CancellationToken cancellationToken = default) => await base.FindByIdAsync(id: id.Id, partitionKey: id.PartInt.ToString(CultureInfo.InvariantCulture), cancellationToken: cancellationToken);
+
+        public override string GetId(NonStringPartitionKey entity) => entity.Id;
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/OrderCosmosDBRepository.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/OrderCosmosDBRepository.cs
index c68536989f..64e0577c1d 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/OrderCosmosDBRepository.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/OrderCosmosDBRepository.cs
@@ -25,5 +25,7 @@ public OrderCosmosDBRepository(CosmosDBUnitOfWork unitOfWork,
         public async Task<Order?> FindByIdAsync(
             (string Id, string WarehouseId) id,
             CancellationToken cancellationToken = default) => await base.FindByIdAsync(id: id.Id, partitionKey: id.WarehouseId, cancellationToken: cancellationToken);
+
+        public override string GetId(Order entity) => entity.Id;
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/PackageContainerCosmosDBRepository.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/PackageContainerCosmosDBRepository.cs
index 5ae3ca2edd..0e1de2783a 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/PackageContainerCosmosDBRepository.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/PackageContainerCosmosDBRepository.cs
@@ -23,5 +23,7 @@ public PackageContainerCosmosDBRepository(CosmosDBUnitOfWork unitOfWork,
         }
 
         public async Task<PackageContainer?> FindByIdAsync(string id, CancellationToken cancellationToken = default) => await base.FindByIdAsync(id: id, cancellationToken: cancellationToken);
+
+        public override string GetId(PackageContainer entity) => entity.Id;
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/ProductCosmosDBRepository.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/ProductCosmosDBRepository.cs
index a5d6a95705..65be2085d9 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/ProductCosmosDBRepository.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/ProductCosmosDBRepository.cs
@@ -23,5 +23,7 @@ public ProductCosmosDBRepository(CosmosDBUnitOfWork unitOfWork,
         }
 
         public async Task<Product?> FindByIdAsync(string id, CancellationToken cancellationToken = default) => await base.FindByIdAsync(id: id, cancellationToken: cancellationToken);
+
+        public override string GetId(Product entity) => entity.Id;
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/RegionCosmosDBRepository.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/RegionCosmosDBRepository.cs
index 7404030777..fd535f6e00 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/RegionCosmosDBRepository.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/RegionCosmosDBRepository.cs
@@ -23,5 +23,7 @@ public RegionCosmosDBRepository(CosmosDBUnitOfWork unitOfWork,
         }
 
         public async Task<Region?> FindByIdAsync(string id, CancellationToken cancellationToken = default) => await base.FindByIdAsync(id: id, cancellationToken: cancellationToken);
+
+        public override string GetId(Region entity) => entity.Id;
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/WithoutPartitionKeyCosmosDBRepository.cs b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/WithoutPartitionKeyCosmosDBRepository.cs
index 437bc5e00f..ea77df50ce 100644
--- a/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/WithoutPartitionKeyCosmosDBRepository.cs
+++ b/Tests/CosmosDB/CosmosDB.Infrastructure/Repositories/WithoutPartitionKeyCosmosDBRepository.cs
@@ -23,5 +23,7 @@ public WithoutPartitionKeyCosmosDBRepository(CosmosDBUnitOfWork unitOfWork,
         }
 
         public async Task<WithoutPartitionKey?> FindByIdAsync(string id, CancellationToken cancellationToken = default) => await base.FindByIdAsync(id: id, cancellationToken: cancellationToken);
+
+        public override string GetId(WithoutPartitionKey entity) => entity.Id;
     }
 }
\ No newline at end of file
diff --git a/Tests/CosmosDB/CosmosDB.application.config b/Tests/CosmosDB/CosmosDB.application.config
index 9c6ca3074b..362cfd11c3 100644
--- a/Tests/CosmosDB/CosmosDB.application.config
+++ b/Tests/CosmosDB/CosmosDB.application.config
@@ -55,6 +55,18 @@
         </setting>
       </settings>
     </group>
+    <group id="e9f6758c-f8db-4cad-af33-827b867be548" title="CosmosDb">
+      <module>Intent.CosmosDB</module>
+      <icon type="UrlImagePath" source="data:image/png;base64,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" />
+      <settings>
+        <setting id="fcb114f7-77b4-4c6a-96c0-41bb146f4166" title="Use Optimistic Concurrency" module="Intent.CosmosDB" type="switch">
+          <hint>Ensures updates are applied only when document etags match, for improved concurrency management</hint>
+          <value>true</value>
+          <isRequired>true</isRequired>
+          <options />
+        </setting>
+      </settings>
+    </group>
     <group id="2392c046-0aa7-4ee5-a77a-e954c4a7aab5" title="CQRS Settings">
       <module>Intent.Application.MediatR</module>
       <icon type="UrlImagePath" source="data:image/png;base64,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" />
diff --git a/Tests/CosmosDB/modules.config b/Tests/CosmosDB/modules.config
index df1db0c6a4..a2ab03bd05 100644
--- a/Tests/CosmosDB/modules.config
+++ b/Tests/CosmosDB/modules.config
@@ -11,7 +11,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
@@ -21,9 +21,9 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
-  <module moduleId="Intent.CosmosDB" version="1.0.3" />
+  <module moduleId="Intent.CosmosDB" version="1.0.4-pre.0" />
   <module moduleId="Intent.DocumentDB.Dtos.AutoMapper" version="1.0.0" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -33,12 +33,12 @@
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.4-pre.0" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/CosmosDBMultiTenancy/CosmosDBMultiTenancy.Infrastructure/CosmosDBMultiTenancy.Infrastructure.csproj b/Tests/CosmosDBMultiTenancy/CosmosDBMultiTenancy.Infrastructure/CosmosDBMultiTenancy.Infrastructure.csproj
index 1391261d80..85ef1efd1d 100644
--- a/Tests/CosmosDBMultiTenancy/CosmosDBMultiTenancy.Infrastructure/CosmosDBMultiTenancy.Infrastructure.csproj
+++ b/Tests/CosmosDBMultiTenancy/CosmosDBMultiTenancy.Infrastructure/CosmosDBMultiTenancy.Infrastructure.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Finbuckle.MultiTenant" Version="6.12.0" />
-    <PackageReference Include="IEvangelist.Azure.CosmosRepository" Version="3.7.0" />
+    <PackageReference Include="IEvangelist.Azure.CosmosRepository" Version="8.1.2" />
     <PackageReference Include="Intent.RoslynWeaver.Attributes" Version="2.1.4" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
diff --git a/Tests/CosmosDBMultiTenancy/CosmosDBMultiTenancy.Infrastructure/Repositories/CosmosDBRepositoryBase.cs b/Tests/CosmosDBMultiTenancy/CosmosDBMultiTenancy.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
index e4eaf50388..739b507b97 100644
--- a/Tests/CosmosDBMultiTenancy/CosmosDBMultiTenancy.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
+++ b/Tests/CosmosDBMultiTenancy/CosmosDBMultiTenancy.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
@@ -96,8 +96,7 @@ public void Remove(TDomain entity)
         public async Task<List<TDomain>> FindAllAsync(CancellationToken cancellationToken = default)
         {
             var documents = await _cosmosRepository.GetAsync(GetHasPartitionKeyExpression(_tenantId), cancellationToken);
-            var results = documents.Select(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -110,8 +109,7 @@ public async Task<List<TDomain>> FindAllAsync(CancellationToken cancellationToke
             try
             {
                 var document = await _cosmosRepository.GetAsync(id, partitionKey ?? _tenantId, cancellationToken: cancellationToken);
-                var entity = document.ToEntity();
-                Track(entity);
+                var entity = LoadAndTrackDocument(document);
 
                 return entity;
             }
@@ -129,8 +127,7 @@ public virtual async Task<List<TDomain>> FindAllAsync(
             predicate = GetFilteredByTenantIdPredicate(predicate);
 
             var documents = await _cosmosRepository.GetAsync(predicate, cancellationToken);
-            var results = documents.Select(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -153,9 +150,12 @@ public virtual async Task<IPagedList<TDomain>> FindAllAsync(
             predicate = GetFilteredByTenantIdPredicate(predicate);
 
             var pagedDocuments = await _cosmosRepository.PageAsync(predicate, pageNo, pageSize, true, cancellationToken);
-            Track(pagedDocuments.Items.Select(document => document.ToEntity()));
+            var entities = LoadAndTrackDocuments(pagedDocuments.Items).ToList();
 
-            return new CosmosPagedList<TDomain, TDocument>(pagedDocuments, pageNo, pageSize);
+            var totalCount = pagedDocuments.Total ?? 0;
+            var pageCount = pagedDocuments.TotalPages ?? 0;
+
+            return new CosmosPagedList<TDomain, TDocument>(entities, totalCount, pageCount, pageNo, pageSize);
         }
 
         public async Task<List<TDomain>> FindByIdsAsync(
@@ -166,8 +166,7 @@ public async Task<List<TDomain>> FindByIdsAsync(
                     .WithParameter("@tenantId", _tenantId)
                     .WithParameter("@ids", ids);
             var documents = await _cosmosRepository.GetByQueryAsync(queryDefinition, cancellationToken);
-            var results = documents.Select(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -213,17 +212,21 @@ private static Expression<Func<TDocument, bool>> AdaptFilterPredicate(Expression
             return Expression.Lambda<Func<TDocument, bool>>(visitor.Visit(expression.Body)!, afterParameter);
         }
 
-        public void Track(IEnumerable<TDomain> items)
+        public TDomain LoadAndTrackDocument(TDocument document)
         {
-            foreach (var item in items)
-            {
-                _unitOfWork.Track(item);
-            }
+            var entity = document.ToEntity();
+
+            _unitOfWork.Track(entity);
+
+            return entity;
         }
 
-        public void Track(TDomain item)
+        public IEnumerable<TDomain> LoadAndTrackDocuments(IEnumerable<TDocument> documents)
         {
-            _unitOfWork.Track(item);
+            foreach (var document in documents)
+            {
+                yield return LoadAndTrackDocument(document);
+            }
         }
 
         private (string UserName, DateTimeOffset TimeStamp) GetAuditDetails()
diff --git a/Tests/CosmosDBMultiTenancy/CosmosDBMultiTenancy.Infrastructure/Repositories/CosmosPagedList.cs b/Tests/CosmosDBMultiTenancy/CosmosDBMultiTenancy.Infrastructure/Repositories/CosmosPagedList.cs
index 67f8ff799d..6938018c99 100644
--- a/Tests/CosmosDBMultiTenancy/CosmosDBMultiTenancy.Infrastructure/Repositories/CosmosPagedList.cs
+++ b/Tests/CosmosDBMultiTenancy/CosmosDBMultiTenancy.Infrastructure/Repositories/CosmosPagedList.cs
@@ -14,16 +14,16 @@ internal class CosmosPagedList<TDomain, TDocument> : List<TDomain>, IPagedList<T
         where TDomain : class
         where TDocument : ICosmosDBDocument<TDomain, TDocument>
     {
-        public CosmosPagedList(IPageQueryResult<TDocument> pagedResult, int pageNo, int pageSize)
+        public CosmosPagedList(IEnumerable<TDomain> pagedResult, int totalCount, int pageCount, int pageNo, int pageSize)
         {
-            TotalCount = pagedResult.Total ?? 0;
-            PageCount = pagedResult.TotalPages ?? 0;
+            TotalCount = totalCount;
+            PageCount = pageCount;
             PageNo = pageNo;
             PageSize = pageSize;
 
-            foreach (var result in pagedResult.Items)
+            foreach (var result in pagedResult)
             {
-                Add(result.ToEntity());
+                Add(result);
             }
         }
 
diff --git a/Tests/CosmosDBMultiTenancy/CosmosDBMultiTenancy.application.config b/Tests/CosmosDBMultiTenancy/CosmosDBMultiTenancy.application.config
index af3fe3ca0c..7789510485 100644
--- a/Tests/CosmosDBMultiTenancy/CosmosDBMultiTenancy.application.config
+++ b/Tests/CosmosDBMultiTenancy/CosmosDBMultiTenancy.application.config
@@ -55,6 +55,18 @@
         </setting>
       </settings>
     </group>
+    <group id="e9f6758c-f8db-4cad-af33-827b867be548" title="CosmosDb">
+      <module>Intent.CosmosDB</module>
+      <icon type="UrlImagePath" source="data:image/png;base64,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" />
+      <settings>
+        <setting id="fcb114f7-77b4-4c6a-96c0-41bb146f4166" title="Use Optimistic Concurrency" module="Intent.CosmosDB" type="switch">
+          <hint>Ensures updates are applied only when document etags match, for improved concurrency management</hint>
+          <value>false</value>
+          <isRequired>true</isRequired>
+          <options />
+        </setting>
+      </settings>
+    </group>
     <group id="2392c046-0aa7-4ee5-a77a-e954c4a7aab5" title="CQRS Settings">
       <module>Intent.Application.MediatR</module>
       <icon type="UrlImagePath" source="data:image/png;base64,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" />
diff --git a/Tests/CosmosDBMultiTenancy/modules.config b/Tests/CosmosDBMultiTenancy/modules.config
index e19fa1084f..d01a6b59e1 100644
--- a/Tests/CosmosDBMultiTenancy/modules.config
+++ b/Tests/CosmosDBMultiTenancy/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.Application.ServiceImplementations" version="4.5.1" />
@@ -20,15 +20,15 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.HealthChecks" version="2.0.2-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
-  <module moduleId="Intent.CosmosDB" version="1.0.3" />
+  <module moduleId="Intent.CosmosDB" version="1.0.4-pre.0" />
   <module moduleId="Intent.DocumentDB.Dtos.AutoMapper" version="1.0.0" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -39,11 +39,11 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.Modules.AspNetCore.MultiTenancy" version="5.1.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
diff --git a/Tests/DtoSettings.Class.Init/modules.config b/Tests/DtoSettings.Class.Init/modules.config
index 56846729bf..e4ec49739f 100644
--- a/Tests/DtoSettings.Class.Init/modules.config
+++ b/Tests/DtoSettings.Class.Init/modules.config
@@ -11,11 +11,11 @@
   <module moduleId="Intent.Application.ServiceImplementations.Conventions.CRUD" version="5.0.3" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -24,11 +24,11 @@
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
diff --git a/Tests/DtoSettings.Class.Internal/Intent.Metadata/Services/Services.designer.config b/Tests/DtoSettings.Class.Internal/Intent.Metadata/Services/Services.designer.config
index 1ae7e4214b..d71997758d 100644
--- a/Tests/DtoSettings.Class.Internal/Intent.Metadata/Services/Services.designer.config
+++ b/Tests/DtoSettings.Class.Internal/Intent.Metadata/Services/Services.designer.config
@@ -8,7 +8,6 @@
   <designerReferences>
     <designerReference id="55d06096-83fe-4acf-86ef-586d254e5170" name="Common Types" module="Intent.Common.Types" />
     <designerReference id="ec7c85f2-e395-4742-adf8-6c1503a6c346" name="Pagination Extensions" module="Intent.Application.Dtos.Pagination" />
-    <designerReference id="6ac83417-e6d5-4699-b88c-aa1d7f894326" name="Services CQRS Extension" module="Intent.Modelers.Services.CQRS" />
     <designerReference id="f36cb21a-faf9-46ff-85e7-41f38345253d" name="Services Domain Interactions" module="Intent.Modelers.Services.DomainInteractions" />
     <designerReference id="55e213e3-1e43-4bb5-abe6-6ff77af23f39" name="Services Types" module="Intent.Modelers.Services" />
     <designerReference id="03bfccb7-d845-411f-ba08-4fddb01bbbda" name="WebApi CQRS Extensions" module="Intent.Metadata.WebApi" />
diff --git a/Tests/DtoSettings.Class.Internal/modules.config b/Tests/DtoSettings.Class.Internal/modules.config
index 56846729bf..b1d7e35dd5 100644
--- a/Tests/DtoSettings.Class.Internal/modules.config
+++ b/Tests/DtoSettings.Class.Internal/modules.config
@@ -11,11 +11,11 @@
   <module moduleId="Intent.Application.ServiceImplementations.Conventions.CRUD" version="5.0.3" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -24,11 +24,10 @@
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
diff --git a/Tests/DtoSettings.Class.Private/Intent.Metadata/Services/Services.designer.config b/Tests/DtoSettings.Class.Private/Intent.Metadata/Services/Services.designer.config
index 1ae7e4214b..d71997758d 100644
--- a/Tests/DtoSettings.Class.Private/Intent.Metadata/Services/Services.designer.config
+++ b/Tests/DtoSettings.Class.Private/Intent.Metadata/Services/Services.designer.config
@@ -8,7 +8,6 @@
   <designerReferences>
     <designerReference id="55d06096-83fe-4acf-86ef-586d254e5170" name="Common Types" module="Intent.Common.Types" />
     <designerReference id="ec7c85f2-e395-4742-adf8-6c1503a6c346" name="Pagination Extensions" module="Intent.Application.Dtos.Pagination" />
-    <designerReference id="6ac83417-e6d5-4699-b88c-aa1d7f894326" name="Services CQRS Extension" module="Intent.Modelers.Services.CQRS" />
     <designerReference id="f36cb21a-faf9-46ff-85e7-41f38345253d" name="Services Domain Interactions" module="Intent.Modelers.Services.DomainInteractions" />
     <designerReference id="55e213e3-1e43-4bb5-abe6-6ff77af23f39" name="Services Types" module="Intent.Modelers.Services" />
     <designerReference id="03bfccb7-d845-411f-ba08-4fddb01bbbda" name="WebApi CQRS Extensions" module="Intent.Metadata.WebApi" />
diff --git a/Tests/DtoSettings.Class.Private/modules.config b/Tests/DtoSettings.Class.Private/modules.config
index 56846729bf..b1d7e35dd5 100644
--- a/Tests/DtoSettings.Class.Private/modules.config
+++ b/Tests/DtoSettings.Class.Private/modules.config
@@ -11,11 +11,11 @@
   <module moduleId="Intent.Application.ServiceImplementations.Conventions.CRUD" version="5.0.3" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -24,11 +24,10 @@
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
diff --git a/Tests/DtoSettings.Class.Protected/Intent.Metadata/Services/Services.designer.config b/Tests/DtoSettings.Class.Protected/Intent.Metadata/Services/Services.designer.config
index 1ae7e4214b..d71997758d 100644
--- a/Tests/DtoSettings.Class.Protected/Intent.Metadata/Services/Services.designer.config
+++ b/Tests/DtoSettings.Class.Protected/Intent.Metadata/Services/Services.designer.config
@@ -8,7 +8,6 @@
   <designerReferences>
     <designerReference id="55d06096-83fe-4acf-86ef-586d254e5170" name="Common Types" module="Intent.Common.Types" />
     <designerReference id="ec7c85f2-e395-4742-adf8-6c1503a6c346" name="Pagination Extensions" module="Intent.Application.Dtos.Pagination" />
-    <designerReference id="6ac83417-e6d5-4699-b88c-aa1d7f894326" name="Services CQRS Extension" module="Intent.Modelers.Services.CQRS" />
     <designerReference id="f36cb21a-faf9-46ff-85e7-41f38345253d" name="Services Domain Interactions" module="Intent.Modelers.Services.DomainInteractions" />
     <designerReference id="55e213e3-1e43-4bb5-abe6-6ff77af23f39" name="Services Types" module="Intent.Modelers.Services" />
     <designerReference id="03bfccb7-d845-411f-ba08-4fddb01bbbda" name="WebApi CQRS Extensions" module="Intent.Metadata.WebApi" />
diff --git a/Tests/DtoSettings.Class.Protected/modules.config b/Tests/DtoSettings.Class.Protected/modules.config
index 56846729bf..b1d7e35dd5 100644
--- a/Tests/DtoSettings.Class.Protected/modules.config
+++ b/Tests/DtoSettings.Class.Protected/modules.config
@@ -11,11 +11,11 @@
   <module moduleId="Intent.Application.ServiceImplementations.Conventions.CRUD" version="5.0.3" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -24,11 +24,10 @@
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
diff --git a/Tests/DtoSettings.Record.Init/Intent.Metadata/Services/Services.designer.config b/Tests/DtoSettings.Record.Init/Intent.Metadata/Services/Services.designer.config
index 1ae7e4214b..d71997758d 100644
--- a/Tests/DtoSettings.Record.Init/Intent.Metadata/Services/Services.designer.config
+++ b/Tests/DtoSettings.Record.Init/Intent.Metadata/Services/Services.designer.config
@@ -8,7 +8,6 @@
   <designerReferences>
     <designerReference id="55d06096-83fe-4acf-86ef-586d254e5170" name="Common Types" module="Intent.Common.Types" />
     <designerReference id="ec7c85f2-e395-4742-adf8-6c1503a6c346" name="Pagination Extensions" module="Intent.Application.Dtos.Pagination" />
-    <designerReference id="6ac83417-e6d5-4699-b88c-aa1d7f894326" name="Services CQRS Extension" module="Intent.Modelers.Services.CQRS" />
     <designerReference id="f36cb21a-faf9-46ff-85e7-41f38345253d" name="Services Domain Interactions" module="Intent.Modelers.Services.DomainInteractions" />
     <designerReference id="55e213e3-1e43-4bb5-abe6-6ff77af23f39" name="Services Types" module="Intent.Modelers.Services" />
     <designerReference id="03bfccb7-d845-411f-ba08-4fddb01bbbda" name="WebApi CQRS Extensions" module="Intent.Metadata.WebApi" />
diff --git a/Tests/DtoSettings.Record.Init/modules.config b/Tests/DtoSettings.Record.Init/modules.config
index 56846729bf..b1d7e35dd5 100644
--- a/Tests/DtoSettings.Record.Init/modules.config
+++ b/Tests/DtoSettings.Record.Init/modules.config
@@ -11,11 +11,11 @@
   <module moduleId="Intent.Application.ServiceImplementations.Conventions.CRUD" version="5.0.3" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -24,11 +24,10 @@
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
diff --git a/Tests/DtoSettings.Record.Internal/Intent.Metadata/Services/Services.designer.config b/Tests/DtoSettings.Record.Internal/Intent.Metadata/Services/Services.designer.config
index 1ae7e4214b..d71997758d 100644
--- a/Tests/DtoSettings.Record.Internal/Intent.Metadata/Services/Services.designer.config
+++ b/Tests/DtoSettings.Record.Internal/Intent.Metadata/Services/Services.designer.config
@@ -8,7 +8,6 @@
   <designerReferences>
     <designerReference id="55d06096-83fe-4acf-86ef-586d254e5170" name="Common Types" module="Intent.Common.Types" />
     <designerReference id="ec7c85f2-e395-4742-adf8-6c1503a6c346" name="Pagination Extensions" module="Intent.Application.Dtos.Pagination" />
-    <designerReference id="6ac83417-e6d5-4699-b88c-aa1d7f894326" name="Services CQRS Extension" module="Intent.Modelers.Services.CQRS" />
     <designerReference id="f36cb21a-faf9-46ff-85e7-41f38345253d" name="Services Domain Interactions" module="Intent.Modelers.Services.DomainInteractions" />
     <designerReference id="55e213e3-1e43-4bb5-abe6-6ff77af23f39" name="Services Types" module="Intent.Modelers.Services" />
     <designerReference id="03bfccb7-d845-411f-ba08-4fddb01bbbda" name="WebApi CQRS Extensions" module="Intent.Metadata.WebApi" />
diff --git a/Tests/DtoSettings.Record.Internal/modules.config b/Tests/DtoSettings.Record.Internal/modules.config
index 56846729bf..b1d7e35dd5 100644
--- a/Tests/DtoSettings.Record.Internal/modules.config
+++ b/Tests/DtoSettings.Record.Internal/modules.config
@@ -11,11 +11,11 @@
   <module moduleId="Intent.Application.ServiceImplementations.Conventions.CRUD" version="5.0.3" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -24,11 +24,10 @@
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
diff --git a/Tests/DtoSettings.Record.Private/Intent.Metadata/Services/Services.designer.config b/Tests/DtoSettings.Record.Private/Intent.Metadata/Services/Services.designer.config
index 1ae7e4214b..d71997758d 100644
--- a/Tests/DtoSettings.Record.Private/Intent.Metadata/Services/Services.designer.config
+++ b/Tests/DtoSettings.Record.Private/Intent.Metadata/Services/Services.designer.config
@@ -8,7 +8,6 @@
   <designerReferences>
     <designerReference id="55d06096-83fe-4acf-86ef-586d254e5170" name="Common Types" module="Intent.Common.Types" />
     <designerReference id="ec7c85f2-e395-4742-adf8-6c1503a6c346" name="Pagination Extensions" module="Intent.Application.Dtos.Pagination" />
-    <designerReference id="6ac83417-e6d5-4699-b88c-aa1d7f894326" name="Services CQRS Extension" module="Intent.Modelers.Services.CQRS" />
     <designerReference id="f36cb21a-faf9-46ff-85e7-41f38345253d" name="Services Domain Interactions" module="Intent.Modelers.Services.DomainInteractions" />
     <designerReference id="55e213e3-1e43-4bb5-abe6-6ff77af23f39" name="Services Types" module="Intent.Modelers.Services" />
     <designerReference id="03bfccb7-d845-411f-ba08-4fddb01bbbda" name="WebApi CQRS Extensions" module="Intent.Metadata.WebApi" />
diff --git a/Tests/DtoSettings.Record.Private/modules.config b/Tests/DtoSettings.Record.Private/modules.config
index 56846729bf..b1d7e35dd5 100644
--- a/Tests/DtoSettings.Record.Private/modules.config
+++ b/Tests/DtoSettings.Record.Private/modules.config
@@ -11,11 +11,11 @@
   <module moduleId="Intent.Application.ServiceImplementations.Conventions.CRUD" version="5.0.3" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -24,11 +24,10 @@
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
diff --git a/Tests/DtoSettings.Record.Protected/Intent.Metadata/Services/Services.designer.config b/Tests/DtoSettings.Record.Protected/Intent.Metadata/Services/Services.designer.config
index 1ae7e4214b..d71997758d 100644
--- a/Tests/DtoSettings.Record.Protected/Intent.Metadata/Services/Services.designer.config
+++ b/Tests/DtoSettings.Record.Protected/Intent.Metadata/Services/Services.designer.config
@@ -8,7 +8,6 @@
   <designerReferences>
     <designerReference id="55d06096-83fe-4acf-86ef-586d254e5170" name="Common Types" module="Intent.Common.Types" />
     <designerReference id="ec7c85f2-e395-4742-adf8-6c1503a6c346" name="Pagination Extensions" module="Intent.Application.Dtos.Pagination" />
-    <designerReference id="6ac83417-e6d5-4699-b88c-aa1d7f894326" name="Services CQRS Extension" module="Intent.Modelers.Services.CQRS" />
     <designerReference id="f36cb21a-faf9-46ff-85e7-41f38345253d" name="Services Domain Interactions" module="Intent.Modelers.Services.DomainInteractions" />
     <designerReference id="55e213e3-1e43-4bb5-abe6-6ff77af23f39" name="Services Types" module="Intent.Modelers.Services" />
     <designerReference id="03bfccb7-d845-411f-ba08-4fddb01bbbda" name="WebApi CQRS Extensions" module="Intent.Metadata.WebApi" />
diff --git a/Tests/DtoSettings.Record.Protected/modules.config b/Tests/DtoSettings.Record.Protected/modules.config
index 56846729bf..b1d7e35dd5 100644
--- a/Tests/DtoSettings.Record.Protected/modules.config
+++ b/Tests/DtoSettings.Record.Protected/modules.config
@@ -11,11 +11,11 @@
   <module moduleId="Intent.Application.ServiceImplementations.Conventions.CRUD" version="5.0.3" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -24,11 +24,10 @@
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
diff --git a/Tests/DtoSettings.Record.Public/Intent.Metadata/Services/Services.designer.config b/Tests/DtoSettings.Record.Public/Intent.Metadata/Services/Services.designer.config
index 1ae7e4214b..d71997758d 100644
--- a/Tests/DtoSettings.Record.Public/Intent.Metadata/Services/Services.designer.config
+++ b/Tests/DtoSettings.Record.Public/Intent.Metadata/Services/Services.designer.config
@@ -8,7 +8,6 @@
   <designerReferences>
     <designerReference id="55d06096-83fe-4acf-86ef-586d254e5170" name="Common Types" module="Intent.Common.Types" />
     <designerReference id="ec7c85f2-e395-4742-adf8-6c1503a6c346" name="Pagination Extensions" module="Intent.Application.Dtos.Pagination" />
-    <designerReference id="6ac83417-e6d5-4699-b88c-aa1d7f894326" name="Services CQRS Extension" module="Intent.Modelers.Services.CQRS" />
     <designerReference id="f36cb21a-faf9-46ff-85e7-41f38345253d" name="Services Domain Interactions" module="Intent.Modelers.Services.DomainInteractions" />
     <designerReference id="55e213e3-1e43-4bb5-abe6-6ff77af23f39" name="Services Types" module="Intent.Modelers.Services" />
     <designerReference id="03bfccb7-d845-411f-ba08-4fddb01bbbda" name="WebApi CQRS Extensions" module="Intent.Metadata.WebApi" />
diff --git a/Tests/DtoSettings.Record.Public/modules.config b/Tests/DtoSettings.Record.Public/modules.config
index 56846729bf..b1d7e35dd5 100644
--- a/Tests/DtoSettings.Record.Public/modules.config
+++ b/Tests/DtoSettings.Record.Public/modules.config
@@ -11,11 +11,11 @@
   <module moduleId="Intent.Application.ServiceImplementations.Conventions.CRUD" version="5.0.3" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -24,11 +24,10 @@
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
diff --git a/Tests/EFCore.Lazy.Loading.Tests/modules.config b/Tests/EFCore.Lazy.Loading.Tests/modules.config
index 844b2c1b51..88e2ace7e2 100644
--- a/Tests/EFCore.Lazy.Loading.Tests/modules.config
+++ b/Tests/EFCore.Lazy.Loading.Tests/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.Application.ServiceImplementations" version="4.5.1" />
@@ -20,13 +20,13 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.HealthChecks" version="2.0.2-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -38,12 +38,12 @@
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.4-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/Entities.Constants.TestApplication/modules.config b/Tests/Entities.Constants.TestApplication/modules.config
index f526f1823d..8798fbf438 100644
--- a/Tests/Entities.Constants.TestApplication/modules.config
+++ b/Tests/Entities.Constants.TestApplication/modules.config
@@ -11,7 +11,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
@@ -20,7 +20,7 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -34,13 +34,13 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/Entities.Interfaces.EF/modules.config b/Tests/Entities.Interfaces.EF/modules.config
index 68ccd3f89c..180ef05114 100644
--- a/Tests/Entities.Interfaces.EF/modules.config
+++ b/Tests/Entities.Interfaces.EF/modules.config
@@ -10,7 +10,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.CRUD.Tests" version="1.3.4" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
@@ -18,7 +18,7 @@
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -27,11 +27,11 @@
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
diff --git a/Tests/Entities.PrivateSetters.EF.CosmosDb/modules.config b/Tests/Entities.PrivateSetters.EF.CosmosDb/modules.config
index e68913c973..9471996b6b 100644
--- a/Tests/Entities.PrivateSetters.EF.CosmosDb/modules.config
+++ b/Tests/Entities.PrivateSetters.EF.CosmosDb/modules.config
@@ -10,10 +10,10 @@
   <module moduleId="Intent.Application.ServiceImplementations" version="4.5.1" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -23,7 +23,7 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
diff --git a/Tests/Entities.PrivateSetters.EF.SqlServer/modules.config b/Tests/Entities.PrivateSetters.EF.SqlServer/modules.config
index b5c8b0935a..713a467a74 100644
--- a/Tests/Entities.PrivateSetters.EF.SqlServer/modules.config
+++ b/Tests/Entities.PrivateSetters.EF.SqlServer/modules.config
@@ -10,10 +10,10 @@
   <module moduleId="Intent.Application.ServiceImplementations" version="4.5.1" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.BasicAuditing" version="1.0.2" />
@@ -24,7 +24,7 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
diff --git a/Tests/Entities.PrivateSetters.MongoDb/modules.config b/Tests/Entities.PrivateSetters.MongoDb/modules.config
index 04bfb26c61..2284bc0f8d 100644
--- a/Tests/Entities.PrivateSetters.MongoDb/modules.config
+++ b/Tests/Entities.PrivateSetters.MongoDb/modules.config
@@ -9,10 +9,10 @@
   <module moduleId="Intent.Application.ServiceImplementations" version="4.5.1" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DocumentDB.Dtos.AutoMapper" version="1.0.0" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -20,7 +20,7 @@
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
   <module moduleId="Intent.MongoDb" version="1.0.12" />
   <module moduleId="Intent.MongoDb.Repositories" version="1.1.1" />
diff --git a/Tests/Entities.PrivateSetters.TestApplication/modules.config b/Tests/Entities.PrivateSetters.TestApplication/modules.config
index c79853a0f6..e214e4b42b 100644
--- a/Tests/Entities.PrivateSetters.TestApplication/modules.config
+++ b/Tests/Entities.PrivateSetters.TestApplication/modules.config
@@ -10,14 +10,14 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -26,11 +26,11 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
 </modules>
\ No newline at end of file
diff --git a/Tests/EntityFramework.SynchronousRepositories/modules.config b/Tests/EntityFramework.SynchronousRepositories/modules.config
index 844b2c1b51..88e2ace7e2 100644
--- a/Tests/EntityFramework.SynchronousRepositories/modules.config
+++ b/Tests/EntityFramework.SynchronousRepositories/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.Application.ServiceImplementations" version="4.5.1" />
@@ -20,13 +20,13 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.HealthChecks" version="2.0.2-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -38,12 +38,12 @@
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.4-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/EntityFrameworkCore.CosmosDb.TestApplication/modules.config b/Tests/EntityFrameworkCore.CosmosDb.TestApplication/modules.config
index 3a0e545722..497150563f 100644
--- a/Tests/EntityFrameworkCore.CosmosDb.TestApplication/modules.config
+++ b/Tests/EntityFrameworkCore.CosmosDb.TestApplication/modules.config
@@ -11,7 +11,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
@@ -20,7 +20,7 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -35,13 +35,13 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/EntityFrameworkCore.Oracle.TestApplication/modules.config b/Tests/EntityFrameworkCore.Oracle.TestApplication/modules.config
index bc6cfb7d85..f5fd000bdd 100644
--- a/Tests/EntityFrameworkCore.Oracle.TestApplication/modules.config
+++ b/Tests/EntityFrameworkCore.Oracle.TestApplication/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.Application.ServiceImplementations" version="4.5.1" />
@@ -20,12 +20,12 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.HealthChecks" version="2.0.2-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -37,12 +37,12 @@
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.4-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
diff --git a/Tests/EntityFrameworkCore.Repositories.TestApplication/modules.config b/Tests/EntityFrameworkCore.Repositories.TestApplication/modules.config
index 8f3a9e0ede..83bf69e137 100644
--- a/Tests/EntityFrameworkCore.Repositories.TestApplication/modules.config
+++ b/Tests/EntityFrameworkCore.Repositories.TestApplication/modules.config
@@ -11,7 +11,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
@@ -20,7 +20,7 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -33,13 +33,13 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/EntityFrameworkCore.SplitQueries.MySql/modules.config b/Tests/EntityFrameworkCore.SplitQueries.MySql/modules.config
index c3d97a0f66..32f9e12c8a 100644
--- a/Tests/EntityFrameworkCore.SplitQueries.MySql/modules.config
+++ b/Tests/EntityFrameworkCore.SplitQueries.MySql/modules.config
@@ -5,7 +5,7 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -14,7 +14,7 @@
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
diff --git a/Tests/EntityFrameworkCore.SplitQueries.PostgreSQL/modules.config b/Tests/EntityFrameworkCore.SplitQueries.PostgreSQL/modules.config
index c3d97a0f66..32f9e12c8a 100644
--- a/Tests/EntityFrameworkCore.SplitQueries.PostgreSQL/modules.config
+++ b/Tests/EntityFrameworkCore.SplitQueries.PostgreSQL/modules.config
@@ -5,7 +5,7 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -14,7 +14,7 @@
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
diff --git a/Tests/EntityFrameworkCore.SplitQueries.SqlServer/modules.config b/Tests/EntityFrameworkCore.SplitQueries.SqlServer/modules.config
index c3d97a0f66..32f9e12c8a 100644
--- a/Tests/EntityFrameworkCore.SplitQueries.SqlServer/modules.config
+++ b/Tests/EntityFrameworkCore.SplitQueries.SqlServer/modules.config
@@ -5,7 +5,7 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -14,7 +14,7 @@
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
diff --git a/Tests/EntityFrameworkCore.SqlServer.TestApplication/modules.config b/Tests/EntityFrameworkCore.SqlServer.TestApplication/modules.config
index 3a0e545722..497150563f 100644
--- a/Tests/EntityFrameworkCore.SqlServer.TestApplication/modules.config
+++ b/Tests/EntityFrameworkCore.SqlServer.TestApplication/modules.config
@@ -11,7 +11,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
@@ -20,7 +20,7 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -35,13 +35,13 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/Finbuckle.SeparateDatabase.TestApplication/modules.config b/Tests/Finbuckle.SeparateDatabase.TestApplication/modules.config
index 5102416ad2..44cdb0be96 100644
--- a/Tests/Finbuckle.SeparateDatabase.TestApplication/modules.config
+++ b/Tests/Finbuckle.SeparateDatabase.TestApplication/modules.config
@@ -13,10 +13,10 @@
   <module moduleId="Intent.Application.ServiceImplementations.Conventions.CRUD" version="5.0.3" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -27,10 +27,10 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.Modules.AspNetCore.MultiTenancy" version="5.1.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
diff --git a/Tests/Finbuckle.SharedDatabase.TestApplication/modules.config b/Tests/Finbuckle.SharedDatabase.TestApplication/modules.config
index aaf65d9dfa..d47f5d3f8b 100644
--- a/Tests/Finbuckle.SharedDatabase.TestApplication/modules.config
+++ b/Tests/Finbuckle.SharedDatabase.TestApplication/modules.config
@@ -14,10 +14,10 @@
   <module moduleId="Intent.Application.ServiceImplementations.Conventions.CRUD" version="5.0.3" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -31,11 +31,11 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.Modules.AspNetCore.MultiTenancy" version="5.1.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
diff --git a/Tests/GraphQL.AzureFunction.TestApplication/modules.config b/Tests/GraphQL.AzureFunction.TestApplication/modules.config
index 7b96451fe3..d7192b2d24 100644
--- a/Tests/GraphQL.AzureFunction.TestApplication/modules.config
+++ b/Tests/GraphQL.AzureFunction.TestApplication/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.Application.ServiceImplementations" version="4.5.1" />
@@ -24,7 +24,7 @@
   <module moduleId="Intent.AzureFunctions.Interop.EntityFrameworkCore" version="4.2.1-pre.0" />
   <module moduleId="Intent.AzureFunctions.OpenApi" version="1.0.4-pre.0" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -38,12 +38,12 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modelers.Services.GraphQL" version="1.0.0" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
diff --git a/Tests/GraphQL.MongoDb.TestApplication/modules.config b/Tests/GraphQL.MongoDb.TestApplication/modules.config
index e8cd32fe8f..db77a26115 100644
--- a/Tests/GraphQL.MongoDb.TestApplication/modules.config
+++ b/Tests/GraphQL.MongoDb.TestApplication/modules.config
@@ -11,14 +11,14 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DocumentDB.Dtos.AutoMapper" version="1.0.0" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
@@ -31,12 +31,12 @@
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.4-pre.0" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modelers.Services.GraphQL" version="1.0.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.MongoDb" version="1.0.12" />
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Api/Controllers/DiffIdsController.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Api/Controllers/DiffIdsController.cs
deleted file mode 100644
index e4587afdbe..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Api/Controllers/DiffIdsController.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net.Mime;
-using System.Threading;
-using System.Threading.Tasks;
-using IntegrationTesting.Tests.Api.Controllers.ResponseTypes;
-using IntegrationTesting.Tests.Application.DiffIds;
-using IntegrationTesting.Tests.Application.DiffIds.CreateDiffId;
-using IntegrationTesting.Tests.Application.DiffIds.DeleteDiffId;
-using IntegrationTesting.Tests.Application.DiffIds.GetDiffIdById;
-using IntegrationTesting.Tests.Application.DiffIds.GetDiffIds;
-using IntegrationTesting.Tests.Application.DiffIds.UpdateDiffId;
-using Intent.RoslynWeaver.Attributes;
-using MediatR;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
-[assembly: IntentTemplate("Intent.AspNetCore.Controllers.Controller", Version = "1.0")]
-
-namespace IntegrationTesting.Tests.Api.Controllers
-{
-    [ApiController]
-    public class DiffIdsController : ControllerBase
-    {
-        private readonly ISender _mediator;
-
-        public DiffIdsController(ISender mediator)
-        {
-            _mediator = mediator ?? throw new ArgumentNullException(nameof(mediator));
-        }
-
-        /// <summary>
-        /// </summary>
-        /// <response code="201">Successfully created.</response>
-        /// <response code="400">One or more validation errors have occurred.</response>
-        [HttpPost("api/diff-id")]
-        [Produces(MediaTypeNames.Application.Json)]
-        [ProducesResponseType(typeof(JsonResponse<Guid>), StatusCodes.Status201Created)]
-        [ProducesResponseType(StatusCodes.Status400BadRequest)]
-        [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status500InternalServerError)]
-        public async Task<ActionResult<JsonResponse<Guid>>> CreateDiffId(
-            [FromBody] CreateDiffIdCommand command,
-            CancellationToken cancellationToken = default)
-        {
-            var result = await _mediator.Send(command, cancellationToken);
-            return CreatedAtAction(nameof(GetDiffIdById), new { id = result }, new JsonResponse<Guid>(result));
-        }
-
-        /// <summary>
-        /// </summary>
-        /// <response code="200">Successfully deleted.</response>
-        /// <response code="400">One or more validation errors have occurred.</response>
-        /// <response code="404">One or more entities could not be found with the provided parameters.</response>
-        [HttpDelete("api/diff-id/{myId}")]
-        [ProducesResponseType(StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status400BadRequest)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status500InternalServerError)]
-        public async Task<ActionResult> DeleteDiffId([FromRoute] Guid myId, CancellationToken cancellationToken = default)
-        {
-            await _mediator.Send(new DeleteDiffIdCommand(myId: myId), cancellationToken);
-            return Ok();
-        }
-
-        /// <summary>
-        /// </summary>
-        /// <response code="204">Successfully updated.</response>
-        /// <response code="400">One or more validation errors have occurred.</response>
-        /// <response code="404">One or more entities could not be found with the provided parameters.</response>
-        [HttpPut("api/diff-id/{myId}")]
-        [ProducesResponseType(StatusCodes.Status204NoContent)]
-        [ProducesResponseType(StatusCodes.Status400BadRequest)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status500InternalServerError)]
-        public async Task<ActionResult> UpdateDiffId(
-            [FromRoute] Guid myId,
-            [FromBody] UpdateDiffIdCommand command,
-            CancellationToken cancellationToken = default)
-        {
-            if (command.MyId == default)
-            {
-                command.MyId = myId;
-            }
-
-            if (myId != command.MyId)
-            {
-                return BadRequest();
-            }
-
-            await _mediator.Send(command, cancellationToken);
-            return NoContent();
-        }
-
-        /// <summary>
-        /// </summary>
-        /// <response code="200">Returns the specified DiffIdDto.</response>
-        /// <response code="400">One or more validation errors have occurred.</response>
-        /// <response code="404">No DiffIdDto could be found with the provided parameters.</response>
-        [HttpGet("api/diff-id/{id}")]
-        [ProducesResponseType(typeof(DiffIdDto), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status400BadRequest)]
-        [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status500InternalServerError)]
-        public async Task<ActionResult<DiffIdDto>> GetDiffIdById(
-            [FromRoute] Guid id,
-            CancellationToken cancellationToken = default)
-        {
-            var result = await _mediator.Send(new GetDiffIdByIdQuery(id: id), cancellationToken);
-            return result == null ? NotFound() : Ok(result);
-        }
-
-        /// <summary>
-        /// </summary>
-        /// <response code="200">Returns the specified List&lt;DiffIdDto&gt;.</response>
-        [HttpGet("api/diff-id")]
-        [ProducesResponseType(typeof(List<DiffIdDto>), StatusCodes.Status200OK)]
-        [ProducesResponseType(typeof(ProblemDetails), StatusCodes.Status500InternalServerError)]
-        public async Task<ActionResult<List<DiffIdDto>>> GetDiffIds(CancellationToken cancellationToken = default)
-        {
-            var result = await _mediator.Send(new GetDiffIdsQuery(), cancellationToken);
-            return Ok(result);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/CreateDiffId/CreateDiffIdCommand.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/CreateDiffId/CreateDiffIdCommand.cs
deleted file mode 100644
index 4697c9927c..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/CreateDiffId/CreateDiffIdCommand.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using IntegrationTesting.Tests.Application.Common.Interfaces;
-using Intent.RoslynWeaver.Attributes;
-using MediatR;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.Application.MediatR.CommandModels", Version = "1.0")]
-
-namespace IntegrationTesting.Tests.Application.DiffIds.CreateDiffId
-{
-    public class CreateDiffIdCommand : IRequest<Guid>, ICommand
-    {
-        public CreateDiffIdCommand(string name)
-        {
-            Name = name;
-        }
-
-        public string Name { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/CreateDiffId/CreateDiffIdCommandHandler.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/CreateDiffId/CreateDiffIdCommandHandler.cs
deleted file mode 100644
index 776ae3aa96..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/CreateDiffId/CreateDiffIdCommandHandler.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using IntegrationTesting.Tests.Domain.Entities;
-using IntegrationTesting.Tests.Domain.Repositories;
-using Intent.RoslynWeaver.Attributes;
-using MediatR;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.Application.MediatR.CommandHandler", Version = "2.0")]
-
-namespace IntegrationTesting.Tests.Application.DiffIds.CreateDiffId
-{
-    [IntentManaged(Mode.Merge, Signature = Mode.Fully)]
-    public class CreateDiffIdCommandHandler : IRequestHandler<CreateDiffIdCommand, Guid>
-    {
-        private readonly IDiffIdRepository _diffIdRepository;
-
-        [IntentManaged(Mode.Merge)]
-        public CreateDiffIdCommandHandler(IDiffIdRepository diffIdRepository)
-        {
-            _diffIdRepository = diffIdRepository;
-        }
-
-        [IntentManaged(Mode.Fully, Body = Mode.Fully)]
-        public async Task<Guid> Handle(CreateDiffIdCommand request, CancellationToken cancellationToken)
-        {
-            var diffId = new DiffId
-            {
-                Name = request.Name
-            };
-
-            _diffIdRepository.Add(diffId);
-            await _diffIdRepository.UnitOfWork.SaveChangesAsync(cancellationToken);
-            return diffId.Id;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/CreateDiffId/CreateDiffIdCommandValidator.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/CreateDiffId/CreateDiffIdCommandValidator.cs
deleted file mode 100644
index a24d3341a0..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/CreateDiffId/CreateDiffIdCommandValidator.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using FluentValidation;
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.Application.MediatR.FluentValidation.CommandValidator", Version = "2.0")]
-
-namespace IntegrationTesting.Tests.Application.DiffIds.CreateDiffId
-{
-    public class CreateDiffIdCommandValidator : AbstractValidator<CreateDiffIdCommand>
-    {
-        [IntentManaged(Mode.Merge)]
-        public CreateDiffIdCommandValidator()
-        {
-            ConfigureValidationRules();
-        }
-
-        private void ConfigureValidationRules()
-        {
-            RuleFor(v => v.Name)
-                .NotNull();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/DeleteDiffId/DeleteDiffIdCommand.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/DeleteDiffId/DeleteDiffIdCommand.cs
deleted file mode 100644
index 075f89fa96..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/DeleteDiffId/DeleteDiffIdCommand.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using IntegrationTesting.Tests.Application.Common.Interfaces;
-using Intent.RoslynWeaver.Attributes;
-using MediatR;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.Application.MediatR.CommandModels", Version = "1.0")]
-
-namespace IntegrationTesting.Tests.Application.DiffIds.DeleteDiffId
-{
-    public class DeleteDiffIdCommand : IRequest, ICommand
-    {
-        public DeleteDiffIdCommand(Guid myId)
-        {
-            MyId = myId;
-        }
-
-        public Guid MyId { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/DeleteDiffId/DeleteDiffIdCommandHandler.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/DeleteDiffId/DeleteDiffIdCommandHandler.cs
deleted file mode 100644
index 8b7dc46c06..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/DeleteDiffId/DeleteDiffIdCommandHandler.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using IntegrationTesting.Tests.Domain.Common.Exceptions;
-using IntegrationTesting.Tests.Domain.Repositories;
-using Intent.RoslynWeaver.Attributes;
-using MediatR;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.Application.MediatR.CommandHandler", Version = "2.0")]
-
-namespace IntegrationTesting.Tests.Application.DiffIds.DeleteDiffId
-{
-    [IntentManaged(Mode.Merge, Signature = Mode.Fully)]
-    public class DeleteDiffIdCommandHandler : IRequestHandler<DeleteDiffIdCommand>
-    {
-        private readonly IDiffIdRepository _diffIdRepository;
-
-        [IntentManaged(Mode.Merge)]
-        public DeleteDiffIdCommandHandler(IDiffIdRepository diffIdRepository)
-        {
-            _diffIdRepository = diffIdRepository;
-        }
-
-        [IntentManaged(Mode.Fully, Body = Mode.Fully)]
-        public async Task Handle(DeleteDiffIdCommand request, CancellationToken cancellationToken)
-        {
-            var diffId = await _diffIdRepository.FindByIdAsync(request.MyId, cancellationToken);
-            if (diffId is null)
-            {
-                throw new NotFoundException($"Could not find DiffId '{request.MyId}'");
-            }
-
-            _diffIdRepository.Remove(diffId);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/DiffIdDto.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/DiffIdDto.cs
deleted file mode 100644
index 3d8991ff30..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/DiffIdDto.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using AutoMapper;
-using IntegrationTesting.Tests.Application.Common.Mappings;
-using IntegrationTesting.Tests.Domain.Entities;
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.Application.Dtos.DtoModel", Version = "1.0")]
-
-namespace IntegrationTesting.Tests.Application.DiffIds
-{
-    public class DiffIdDto : IMapFrom<DiffId>
-    {
-        public DiffIdDto()
-        {
-            Name = null!;
-        }
-
-        public Guid Id { get; set; }
-        public string Name { get; set; }
-
-        public static DiffIdDto Create(Guid id, string name)
-        {
-            return new DiffIdDto
-            {
-                Id = id,
-                Name = name
-            };
-        }
-
-        public void Mapping(Profile profile)
-        {
-            profile.CreateMap<DiffId, DiffIdDto>();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/DiffIdDtoMappingExtensions.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/DiffIdDtoMappingExtensions.cs
deleted file mode 100644
index b666160550..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/DiffIdDtoMappingExtensions.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using AutoMapper;
-using IntegrationTesting.Tests.Domain.Entities;
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.Application.Dtos.AutoMapper.MappingExtensions", Version = "1.0")]
-
-namespace IntegrationTesting.Tests.Application.DiffIds
-{
-    public static class DiffIdDtoMappingExtensions
-    {
-        public static DiffIdDto MapToDiffIdDto(this DiffId projectFrom, IMapper mapper)
-            => mapper.Map<DiffIdDto>(projectFrom);
-
-        public static List<DiffIdDto> MapToDiffIdDtoList(this IEnumerable<DiffId> projectFrom, IMapper mapper)
-            => projectFrom.Select(x => x.MapToDiffIdDto(mapper)).ToList();
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/GetDiffIdById/GetDiffIdByIdQuery.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/GetDiffIdById/GetDiffIdByIdQuery.cs
deleted file mode 100644
index 020a850768..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/GetDiffIdById/GetDiffIdByIdQuery.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using IntegrationTesting.Tests.Application.Common.Interfaces;
-using Intent.RoslynWeaver.Attributes;
-using MediatR;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.Application.MediatR.QueryModels", Version = "1.0")]
-
-namespace IntegrationTesting.Tests.Application.DiffIds.GetDiffIdById
-{
-    public class GetDiffIdByIdQuery : IRequest<DiffIdDto>, IQuery
-    {
-        public GetDiffIdByIdQuery(Guid id)
-        {
-            Id = id;
-        }
-
-        public Guid Id { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/GetDiffIdById/GetDiffIdByIdQueryHandler.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/GetDiffIdById/GetDiffIdByIdQueryHandler.cs
deleted file mode 100644
index 3dc0c4a55c..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/GetDiffIdById/GetDiffIdByIdQueryHandler.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using AutoMapper;
-using IntegrationTesting.Tests.Domain.Common.Exceptions;
-using IntegrationTesting.Tests.Domain.Repositories;
-using Intent.RoslynWeaver.Attributes;
-using MediatR;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.Application.MediatR.QueryHandler", Version = "1.0")]
-
-namespace IntegrationTesting.Tests.Application.DiffIds.GetDiffIdById
-{
-    [IntentManaged(Mode.Merge, Signature = Mode.Fully)]
-    public class GetDiffIdByIdQueryHandler : IRequestHandler<GetDiffIdByIdQuery, DiffIdDto>
-    {
-        private readonly IDiffIdRepository _diffIdRepository;
-        private readonly IMapper _mapper;
-
-        [IntentManaged(Mode.Merge)]
-        public GetDiffIdByIdQueryHandler(IDiffIdRepository diffIdRepository, IMapper mapper)
-        {
-            _diffIdRepository = diffIdRepository;
-            _mapper = mapper;
-        }
-
-        [IntentManaged(Mode.Fully, Body = Mode.Fully)]
-        public async Task<DiffIdDto> Handle(GetDiffIdByIdQuery request, CancellationToken cancellationToken)
-        {
-            var diffId = await _diffIdRepository.FindByIdAsync(request.Id, cancellationToken);
-            if (diffId is null)
-            {
-                throw new NotFoundException($"Could not find DiffId '{request.Id}'");
-            }
-            return diffId.MapToDiffIdDto(_mapper);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/GetDiffIdById/GetDiffIdByIdQueryValidator.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/GetDiffIdById/GetDiffIdByIdQueryValidator.cs
deleted file mode 100644
index 3e10f398d5..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/GetDiffIdById/GetDiffIdByIdQueryValidator.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using FluentValidation;
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.Application.MediatR.FluentValidation.QueryValidator", Version = "2.0")]
-
-namespace IntegrationTesting.Tests.Application.DiffIds.GetDiffIdById
-{
-    public class GetDiffIdByIdQueryValidator : AbstractValidator<GetDiffIdByIdQuery>
-    {
-        [IntentManaged(Mode.Merge)]
-        public GetDiffIdByIdQueryValidator()
-        {
-            ConfigureValidationRules();
-        }
-
-        private void ConfigureValidationRules()
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/GetDiffIds/GetDiffIdsQuery.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/GetDiffIds/GetDiffIdsQuery.cs
deleted file mode 100644
index 0258c76066..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/GetDiffIds/GetDiffIdsQuery.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Collections.Generic;
-using IntegrationTesting.Tests.Application.Common.Interfaces;
-using Intent.RoslynWeaver.Attributes;
-using MediatR;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.Application.MediatR.QueryModels", Version = "1.0")]
-
-namespace IntegrationTesting.Tests.Application.DiffIds.GetDiffIds
-{
-    public class GetDiffIdsQuery : IRequest<List<DiffIdDto>>, IQuery
-    {
-        public GetDiffIdsQuery()
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/GetDiffIds/GetDiffIdsQueryHandler.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/GetDiffIds/GetDiffIdsQueryHandler.cs
deleted file mode 100644
index 674b2329b7..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/GetDiffIds/GetDiffIdsQueryHandler.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using AutoMapper;
-using IntegrationTesting.Tests.Domain.Repositories;
-using Intent.RoslynWeaver.Attributes;
-using MediatR;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.Application.MediatR.QueryHandler", Version = "1.0")]
-
-namespace IntegrationTesting.Tests.Application.DiffIds.GetDiffIds
-{
-    [IntentManaged(Mode.Merge, Signature = Mode.Fully)]
-    public class GetDiffIdsQueryHandler : IRequestHandler<GetDiffIdsQuery, List<DiffIdDto>>
-    {
-        private readonly IDiffIdRepository _diffIdRepository;
-        private readonly IMapper _mapper;
-
-        [IntentManaged(Mode.Merge)]
-        public GetDiffIdsQueryHandler(IDiffIdRepository diffIdRepository, IMapper mapper)
-        {
-            _diffIdRepository = diffIdRepository;
-            _mapper = mapper;
-        }
-
-        [IntentManaged(Mode.Fully, Body = Mode.Fully)]
-        public async Task<List<DiffIdDto>> Handle(GetDiffIdsQuery request, CancellationToken cancellationToken)
-        {
-            var diffIds = await _diffIdRepository.FindAllAsync(cancellationToken);
-            return diffIds.MapToDiffIdDtoList(_mapper);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/GetDiffIds/GetDiffIdsQueryValidator.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/GetDiffIds/GetDiffIdsQueryValidator.cs
deleted file mode 100644
index a82d3b5cd9..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/GetDiffIds/GetDiffIdsQueryValidator.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using FluentValidation;
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.Application.MediatR.FluentValidation.QueryValidator", Version = "2.0")]
-
-namespace IntegrationTesting.Tests.Application.DiffIds.GetDiffIds
-{
-    public class GetDiffIdsQueryValidator : AbstractValidator<GetDiffIdsQuery>
-    {
-        [IntentManaged(Mode.Merge)]
-        public GetDiffIdsQueryValidator()
-        {
-            ConfigureValidationRules();
-        }
-
-        private void ConfigureValidationRules()
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/UpdateDiffId/UpdateDiffIdCommand.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/UpdateDiffId/UpdateDiffIdCommand.cs
deleted file mode 100644
index da5b7b04b0..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/UpdateDiffId/UpdateDiffIdCommand.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using IntegrationTesting.Tests.Application.Common.Interfaces;
-using Intent.RoslynWeaver.Attributes;
-using MediatR;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.Application.MediatR.CommandModels", Version = "1.0")]
-
-namespace IntegrationTesting.Tests.Application.DiffIds.UpdateDiffId
-{
-    public class UpdateDiffIdCommand : IRequest, ICommand
-    {
-        public UpdateDiffIdCommand(Guid myId, string name)
-        {
-            MyId = myId;
-            Name = name;
-        }
-
-        public Guid MyId { get; set; }
-        public string Name { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/UpdateDiffId/UpdateDiffIdCommandHandler.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/UpdateDiffId/UpdateDiffIdCommandHandler.cs
deleted file mode 100644
index 378f514600..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/UpdateDiffId/UpdateDiffIdCommandHandler.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using IntegrationTesting.Tests.Domain.Common.Exceptions;
-using IntegrationTesting.Tests.Domain.Repositories;
-using Intent.RoslynWeaver.Attributes;
-using MediatR;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.Application.MediatR.CommandHandler", Version = "2.0")]
-
-namespace IntegrationTesting.Tests.Application.DiffIds.UpdateDiffId
-{
-    [IntentManaged(Mode.Merge, Signature = Mode.Fully)]
-    public class UpdateDiffIdCommandHandler : IRequestHandler<UpdateDiffIdCommand>
-    {
-        private readonly IDiffIdRepository _diffIdRepository;
-
-        [IntentManaged(Mode.Merge)]
-        public UpdateDiffIdCommandHandler(IDiffIdRepository diffIdRepository)
-        {
-            _diffIdRepository = diffIdRepository;
-        }
-
-        [IntentManaged(Mode.Fully, Body = Mode.Fully)]
-        public async Task Handle(UpdateDiffIdCommand request, CancellationToken cancellationToken)
-        {
-            var diffId = await _diffIdRepository.FindByIdAsync(request.MyId, cancellationToken);
-            if (diffId is null)
-            {
-                throw new NotFoundException($"Could not find DiffId '{request.MyId}'");
-            }
-
-            diffId.Name = request.Name;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/UpdateDiffId/UpdateDiffIdCommandValidator.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/UpdateDiffId/UpdateDiffIdCommandValidator.cs
deleted file mode 100644
index 52fef37ecc..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Application/DiffIds/UpdateDiffId/UpdateDiffIdCommandValidator.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using FluentValidation;
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.Application.MediatR.FluentValidation.CommandValidator", Version = "2.0")]
-
-namespace IntegrationTesting.Tests.Application.DiffIds.UpdateDiffId
-{
-    public class UpdateDiffIdCommandValidator : AbstractValidator<UpdateDiffIdCommand>
-    {
-        [IntentManaged(Mode.Merge)]
-        public UpdateDiffIdCommandValidator()
-        {
-            ConfigureValidationRules();
-        }
-
-        private void ConfigureValidationRules()
-        {
-            RuleFor(v => v.Name)
-                .NotNull();
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Domain/Entities/DiffId.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Domain/Entities/DiffId.cs
deleted file mode 100644
index 3c58b7a9f0..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Domain/Entities/DiffId.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using IntegrationTesting.Tests.Domain.Common;
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: IntentTemplate("Intent.Entities.DomainEntity", Version = "2.0")]
-
-namespace IntegrationTesting.Tests.Domain.Entities
-{
-    public class DiffId : IHasDomainEvent
-    {
-        public Guid Id { get; set; }
-
-        public string Name { get; set; }
-
-        public List<DomainEvent> DomainEvents { get; set; } = new List<DomainEvent>();
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Domain/Repositories/IDiffIdRepository.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Domain/Repositories/IDiffIdRepository.cs
deleted file mode 100644
index 6c9529294a..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Domain/Repositories/IDiffIdRepository.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using IntegrationTesting.Tests.Domain.Entities;
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.Entities.Repositories.Api.EntityRepositoryInterface", Version = "1.0")]
-
-namespace IntegrationTesting.Tests.Domain.Repositories
-{
-    [IntentManaged(Mode.Merge, Signature = Mode.Fully)]
-    public interface IDiffIdRepository : IEFRepository<DiffId, DiffId>
-    {
-        [IntentManaged(Mode.Fully)]
-        Task<DiffId?> FindByIdAsync(Guid id, CancellationToken cancellationToken = default);
-        [IntentManaged(Mode.Fully)]
-        Task<List<DiffId>> FindByIdsAsync(Guid[] ids, CancellationToken cancellationToken = default);
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Infrastructure/DependencyInjection.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Infrastructure/DependencyInjection.cs
index be6613817a..cb6719e350 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Infrastructure/DependencyInjection.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Infrastructure/DependencyInjection.cs
@@ -29,7 +29,6 @@ public static IServiceCollection AddInfrastructure(this IServiceCollection servi
             services.AddTransient<IBadSignaturesRepository, BadSignaturesRepository>();
             services.AddTransient<IChildRepository, ChildRepository>();
             services.AddTransient<ICustomerRepository, CustomerRepository>();
-            services.AddTransient<IDiffIdRepository, DiffIdRepository>();
             services.AddTransient<IDiffPkRepository, DiffPkRepository>();
             services.AddTransient<IDtoReturnRepository, DtoReturnRepository>();
             services.AddTransient<INoReturnRepository, NoReturnRepository>();
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Infrastructure/Persistence/ApplicationDbContext.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Infrastructure/Persistence/ApplicationDbContext.cs
index 15037ba479..86564fce82 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Infrastructure/Persistence/ApplicationDbContext.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Infrastructure/Persistence/ApplicationDbContext.cs
@@ -28,7 +28,6 @@ public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options, IDom
         public DbSet<BadSignatures> BadSignatures { get; set; }
         public DbSet<Child> Children { get; set; }
         public DbSet<Customer> Customers { get; set; }
-        public DbSet<DiffId> DiffIds { get; set; }
         public DbSet<DiffPk> DiffPks { get; set; }
         public DbSet<DtoReturn> DtoReturns { get; set; }
         public DbSet<NoReturn> NoReturns { get; set; }
@@ -59,7 +58,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.ApplyConfiguration(new BadSignaturesConfiguration());
             modelBuilder.ApplyConfiguration(new ChildConfiguration());
             modelBuilder.ApplyConfiguration(new CustomerConfiguration());
-            modelBuilder.ApplyConfiguration(new DiffIdConfiguration());
             modelBuilder.ApplyConfiguration(new DiffPkConfiguration());
             modelBuilder.ApplyConfiguration(new DtoReturnConfiguration());
             modelBuilder.ApplyConfiguration(new NoReturnConfiguration());
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Infrastructure/Persistence/Configurations/DiffIdConfiguration.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Infrastructure/Persistence/Configurations/DiffIdConfiguration.cs
deleted file mode 100644
index e3e195e62b..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Infrastructure/Persistence/Configurations/DiffIdConfiguration.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using IntegrationTesting.Tests.Domain.Entities;
-using Intent.RoslynWeaver.Attributes;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.EntityFrameworkCore.EntityTypeConfiguration", Version = "1.0")]
-
-namespace IntegrationTesting.Tests.Infrastructure.Persistence.Configurations
-{
-    public class DiffIdConfiguration : IEntityTypeConfiguration<DiffId>
-    {
-        public void Configure(EntityTypeBuilder<DiffId> builder)
-        {
-            builder.HasKey(x => x.Id);
-
-            builder.Property(x => x.Name)
-                .IsRequired();
-
-            builder.Ignore(e => e.DomainEvents);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Infrastructure/Repositories/DiffIdRepository.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Infrastructure/Repositories/DiffIdRepository.cs
deleted file mode 100644
index 25e1bb5411..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.Infrastructure/Repositories/DiffIdRepository.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using AutoMapper;
-using IntegrationTesting.Tests.Domain.Entities;
-using IntegrationTesting.Tests.Domain.Repositories;
-using IntegrationTesting.Tests.Infrastructure.Persistence;
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.EntityFrameworkCore.Repositories.Repository", Version = "1.0")]
-
-namespace IntegrationTesting.Tests.Infrastructure.Repositories
-{
-    [IntentManaged(Mode.Merge, Signature = Mode.Fully)]
-    public class DiffIdRepository : RepositoryBase<DiffId, DiffId, ApplicationDbContext>, IDiffIdRepository
-    {
-        public DiffIdRepository(ApplicationDbContext dbContext, IMapper mapper) : base(dbContext, mapper)
-        {
-        }
-
-        public async Task<DiffId?> FindByIdAsync(Guid id, CancellationToken cancellationToken = default)
-        {
-            return await FindAsync(x => x.Id == id, cancellationToken);
-        }
-
-        public async Task<List<DiffId>> FindByIdsAsync(Guid[] ids, CancellationToken cancellationToken = default)
-        {
-            return await FindAllAsync(x => ids.Contains(x.Id), cancellationToken);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/BadSignatures/BadSignaturesHttpClient.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/BadSignaturesHttpClient.cs
similarity index 98%
rename from Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/BadSignatures/BadSignaturesHttpClient.cs
rename to Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/BadSignaturesHttpClient.cs
index 9c6b62e9c3..37eb01e474 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/BadSignatures/BadSignaturesHttpClient.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/BadSignaturesHttpClient.cs
@@ -9,7 +9,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.HttpClient", Version = "2.0")]
 
-namespace IntegrationTesting.Tests.IntegrationTests.HttpClients.BadSignatures
+namespace IntegrationTesting.Tests.IntegrationTests.HttpClients
 {
     public class BadSignaturesHttpClient : IBadSignaturesService
     {
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Children/ChildrenHttpClient.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/ChildrenHttpClient.cs
similarity index 98%
rename from Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Children/ChildrenHttpClient.cs
rename to Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/ChildrenHttpClient.cs
index ee5de43783..c7585872aa 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Children/ChildrenHttpClient.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/ChildrenHttpClient.cs
@@ -8,7 +8,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.HttpClient", Version = "2.0")]
 
-namespace IntegrationTesting.Tests.IntegrationTests.HttpClients.Children
+namespace IntegrationTesting.Tests.IntegrationTests.HttpClients
 {
     public class ChildrenHttpClient : IChildrenService
     {
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Customers/CustomersHttpClient.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/CustomersHttpClient.cs
similarity index 98%
rename from Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Customers/CustomersHttpClient.cs
rename to Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/CustomersHttpClient.cs
index a5e42cb6dc..64e89ac7ab 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Customers/CustomersHttpClient.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/CustomersHttpClient.cs
@@ -8,7 +8,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.HttpClient", Version = "2.0")]
 
-namespace IntegrationTesting.Tests.IntegrationTests.HttpClients.Customers
+namespace IntegrationTesting.Tests.IntegrationTests.HttpClients
 {
     public class CustomersHttpClient : ICustomersService
     {
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/DiffIds/DiffIdsHttpClient.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/DiffIds/DiffIdsHttpClient.cs
deleted file mode 100644
index 6ef74465a1..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/DiffIds/DiffIdsHttpClient.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-using System.Net.Http.Headers;
-using System.Text;
-using System.Text.Json;
-using IntegrationTesting.Tests.IntegrationTests.Services.DiffIds;
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
-[assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.HttpClient", Version = "2.0")]
-
-namespace IntegrationTesting.Tests.IntegrationTests.HttpClients.DiffIds
-{
-    public class DiffIdsHttpClient : IDiffIdsService
-    {
-        private readonly JsonSerializerOptions _serializerOptions;
-        private readonly HttpClient _httpClient;
-
-        public DiffIdsHttpClient(HttpClient httpClient)
-        {
-            _httpClient = httpClient;
-            _serializerOptions = new JsonSerializerOptions
-            {
-                PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-            };
-        }
-
-        public async Task<Guid> CreateDiffIdAsync(
-            CreateDiffIdCommand command,
-            CancellationToken cancellationToken = default)
-        {
-            var relativeUri = $"api/diff-id";
-            var httpRequest = new HttpRequestMessage(HttpMethod.Post, relativeUri);
-            httpRequest.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-
-            var content = JsonSerializer.Serialize(command, _serializerOptions);
-            httpRequest.Content = new StringContent(content, Encoding.UTF8, "application/json");
-
-            using (var response = await _httpClient.SendAsync(httpRequest, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false))
-            {
-                if (!response.IsSuccessStatusCode)
-                {
-                    throw await HttpClientRequestException.Create(_httpClient.BaseAddress!, httpRequest, response, cancellationToken).ConfigureAwait(false);
-                }
-
-                using (var contentStream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false))
-                {
-                    var wrappedObj = (await JsonSerializer.DeserializeAsync<JsonResponse<Guid>>(contentStream, _serializerOptions, cancellationToken).ConfigureAwait(false))!;
-                    return wrappedObj!.Value;
-                }
-            }
-        }
-
-        public async Task DeleteDiffIdAsync(Guid myId, CancellationToken cancellationToken = default)
-        {
-            var relativeUri = $"api/diff-id/{myId}";
-            var httpRequest = new HttpRequestMessage(HttpMethod.Delete, relativeUri);
-            httpRequest.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-
-            using (var response = await _httpClient.SendAsync(httpRequest, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false))
-            {
-                if (!response.IsSuccessStatusCode)
-                {
-                    throw await HttpClientRequestException.Create(_httpClient.BaseAddress!, httpRequest, response, cancellationToken).ConfigureAwait(false);
-                }
-            }
-        }
-
-        public async Task UpdateDiffIdAsync(
-            Guid myId,
-            UpdateDiffIdCommand command,
-            CancellationToken cancellationToken = default)
-        {
-            var relativeUri = $"api/diff-id/{myId}";
-            var httpRequest = new HttpRequestMessage(HttpMethod.Put, relativeUri);
-            httpRequest.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-
-            var content = JsonSerializer.Serialize(command, _serializerOptions);
-            httpRequest.Content = new StringContent(content, Encoding.UTF8, "application/json");
-
-            using (var response = await _httpClient.SendAsync(httpRequest, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false))
-            {
-                if (!response.IsSuccessStatusCode)
-                {
-                    throw await HttpClientRequestException.Create(_httpClient.BaseAddress!, httpRequest, response, cancellationToken).ConfigureAwait(false);
-                }
-            }
-        }
-
-        public async Task<DiffIdDto> GetDiffIdByIdAsync(Guid id, CancellationToken cancellationToken = default)
-        {
-            var relativeUri = $"api/diff-id/{id}";
-            var httpRequest = new HttpRequestMessage(HttpMethod.Get, relativeUri);
-            httpRequest.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-
-            using (var response = await _httpClient.SendAsync(httpRequest, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false))
-            {
-                if (!response.IsSuccessStatusCode)
-                {
-                    throw await HttpClientRequestException.Create(_httpClient.BaseAddress!, httpRequest, response, cancellationToken).ConfigureAwait(false);
-                }
-
-                using (var contentStream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false))
-                {
-                    return (await JsonSerializer.DeserializeAsync<DiffIdDto>(contentStream, _serializerOptions, cancellationToken).ConfigureAwait(false))!;
-                }
-            }
-        }
-
-        public async Task<List<DiffIdDto>> GetDiffIdsAsync(CancellationToken cancellationToken = default)
-        {
-            var relativeUri = $"api/diff-id";
-            var httpRequest = new HttpRequestMessage(HttpMethod.Get, relativeUri);
-            httpRequest.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-
-            using (var response = await _httpClient.SendAsync(httpRequest, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false))
-            {
-                if (!response.IsSuccessStatusCode)
-                {
-                    throw await HttpClientRequestException.Create(_httpClient.BaseAddress!, httpRequest, response, cancellationToken).ConfigureAwait(false);
-                }
-
-                using (var contentStream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false))
-                {
-                    return (await JsonSerializer.DeserializeAsync<List<DiffIdDto>>(contentStream, _serializerOptions, cancellationToken).ConfigureAwait(false))!;
-                }
-            }
-        }
-
-        public void Dispose()
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/DiffIds/IDiffIdsService.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/DiffIds/IDiffIdsService.cs
deleted file mode 100644
index 243ea1e70e..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/DiffIds/IDiffIdsService.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using IntegrationTesting.Tests.IntegrationTests.Services.DiffIds;
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
-[assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ProxyServiceContract", Version = "1.0")]
-
-namespace IntegrationTesting.Tests.IntegrationTests.HttpClients.DiffIds
-{
-    public interface IDiffIdsService : IDisposable
-    {
-        Task<Guid> CreateDiffIdAsync(CreateDiffIdCommand command, CancellationToken cancellationToken = default);
-        Task DeleteDiffIdAsync(Guid myId, CancellationToken cancellationToken = default);
-        Task UpdateDiffIdAsync(Guid myId, UpdateDiffIdCommand command, CancellationToken cancellationToken = default);
-        Task<DiffIdDto> GetDiffIdByIdAsync(Guid id, CancellationToken cancellationToken = default);
-        Task<List<DiffIdDto>> GetDiffIdsAsync(CancellationToken cancellationToken = default);
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/DtoReturns/DtoReturnsHttpClient.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/DtoReturnsHttpClient.cs
similarity index 98%
rename from Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/DtoReturns/DtoReturnsHttpClient.cs
rename to Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/DtoReturnsHttpClient.cs
index a32454041c..c1c1ab4cd1 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/DtoReturns/DtoReturnsHttpClient.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/DtoReturnsHttpClient.cs
@@ -8,7 +8,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.HttpClient", Version = "2.0")]
 
-namespace IntegrationTesting.Tests.IntegrationTests.HttpClients.DtoReturns
+namespace IntegrationTesting.Tests.IntegrationTests.HttpClients
 {
     public class DtoReturnsHttpClient : IDtoReturnsService
     {
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/BadSignatures/IBadSignaturesService.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/IBadSignaturesService.cs
similarity index 92%
rename from Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/BadSignatures/IBadSignaturesService.cs
rename to Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/IBadSignaturesService.cs
index 71d567965e..c7f130ab5d 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/BadSignatures/IBadSignaturesService.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/IBadSignaturesService.cs
@@ -5,7 +5,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ProxyServiceContract", Version = "1.0")]
 
-namespace IntegrationTesting.Tests.IntegrationTests.HttpClients.BadSignatures
+namespace IntegrationTesting.Tests.IntegrationTests.HttpClients
 {
     public interface IBadSignaturesService : IDisposable
     {
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Children/IChildrenService.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/IChildrenService.cs
similarity index 92%
rename from Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Children/IChildrenService.cs
rename to Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/IChildrenService.cs
index a61815554e..1caebbe83f 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Children/IChildrenService.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/IChildrenService.cs
@@ -5,7 +5,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ProxyServiceContract", Version = "1.0")]
 
-namespace IntegrationTesting.Tests.IntegrationTests.HttpClients.Children
+namespace IntegrationTesting.Tests.IntegrationTests.HttpClients
 {
     public interface IChildrenService : IDisposable
     {
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Customers/ICustomersService.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/ICustomersService.cs
similarity index 92%
rename from Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Customers/ICustomersService.cs
rename to Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/ICustomersService.cs
index 7e2fa9ead9..cd64eaa832 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Customers/ICustomersService.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/ICustomersService.cs
@@ -5,7 +5,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ProxyServiceContract", Version = "1.0")]
 
-namespace IntegrationTesting.Tests.IntegrationTests.HttpClients.Customers
+namespace IntegrationTesting.Tests.IntegrationTests.HttpClients
 {
     public interface ICustomersService : IDisposable
     {
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/DtoReturns/IDtoReturnsService.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/IDtoReturnsService.cs
similarity index 92%
rename from Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/DtoReturns/IDtoReturnsService.cs
rename to Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/IDtoReturnsService.cs
index 8a2caa58d7..352d1e52d5 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/DtoReturns/IDtoReturnsService.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/IDtoReturnsService.cs
@@ -5,7 +5,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ProxyServiceContract", Version = "1.0")]
 
-namespace IntegrationTesting.Tests.IntegrationTests.HttpClients.DtoReturns
+namespace IntegrationTesting.Tests.IntegrationTests.HttpClients
 {
     public interface IDtoReturnsService : IDisposable
     {
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/NoReturns/INoReturnsService.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/INoReturnsService.cs
similarity index 92%
rename from Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/NoReturns/INoReturnsService.cs
rename to Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/INoReturnsService.cs
index 335256f8bf..c7ea16235a 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/NoReturns/INoReturnsService.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/INoReturnsService.cs
@@ -5,7 +5,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ProxyServiceContract", Version = "1.0")]
 
-namespace IntegrationTesting.Tests.IntegrationTests.HttpClients.NoReturns
+namespace IntegrationTesting.Tests.IntegrationTests.HttpClients
 {
     public interface INoReturnsService : IDisposable
     {
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Orders/IOrdersService.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/IOrdersService.cs
similarity index 95%
rename from Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Orders/IOrdersService.cs
rename to Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/IOrdersService.cs
index 45e049f84c..63cee52e6f 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Orders/IOrdersService.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/IOrdersService.cs
@@ -5,7 +5,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ProxyServiceContract", Version = "1.0")]
 
-namespace IntegrationTesting.Tests.IntegrationTests.HttpClients.Orders
+namespace IntegrationTesting.Tests.IntegrationTests.HttpClients
 {
     public interface IOrdersService : IDisposable
     {
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Parents/IParentsService.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/IParentsService.cs
similarity index 92%
rename from Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Parents/IParentsService.cs
rename to Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/IParentsService.cs
index 9066fec27e..f551940129 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Parents/IParentsService.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/IParentsService.cs
@@ -5,7 +5,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ProxyServiceContract", Version = "1.0")]
 
-namespace IntegrationTesting.Tests.IntegrationTests.HttpClients.Parents
+namespace IntegrationTesting.Tests.IntegrationTests.HttpClients
 {
     public interface IParentsService : IDisposable
     {
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/PartialCruds/IPartialCrudsService.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/IPartialCrudsService.cs
similarity index 90%
rename from Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/PartialCruds/IPartialCrudsService.cs
rename to Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/IPartialCrudsService.cs
index c03d1b4567..71d614bfe0 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/PartialCruds/IPartialCrudsService.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/IPartialCrudsService.cs
@@ -5,7 +5,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ProxyServiceContract", Version = "1.0")]
 
-namespace IntegrationTesting.Tests.IntegrationTests.HttpClients.PartialCruds
+namespace IntegrationTesting.Tests.IntegrationTests.HttpClients
 {
     public interface IPartialCrudsService : IDisposable
     {
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/NoReturns/NoReturnsHttpClient.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/NoReturnsHttpClient.cs
similarity index 98%
rename from Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/NoReturns/NoReturnsHttpClient.cs
rename to Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/NoReturnsHttpClient.cs
index 379604454e..a3fcd75055 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/NoReturns/NoReturnsHttpClient.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/NoReturnsHttpClient.cs
@@ -8,7 +8,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.HttpClient", Version = "2.0")]
 
-namespace IntegrationTesting.Tests.IntegrationTests.HttpClients.NoReturns
+namespace IntegrationTesting.Tests.IntegrationTests.HttpClients
 {
     public class NoReturnsHttpClient : INoReturnsService
     {
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Orders/OrdersHttpClient.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/OrdersHttpClient.cs
similarity index 99%
rename from Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Orders/OrdersHttpClient.cs
rename to Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/OrdersHttpClient.cs
index 9e3f8d063c..85bd0460c9 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Orders/OrdersHttpClient.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/OrdersHttpClient.cs
@@ -9,7 +9,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.HttpClient", Version = "2.0")]
 
-namespace IntegrationTesting.Tests.IntegrationTests.HttpClients.Orders
+namespace IntegrationTesting.Tests.IntegrationTests.HttpClients
 {
     public class OrdersHttpClient : IOrdersService
     {
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Parents/ParentsHttpClient.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/ParentsHttpClient.cs
similarity index 98%
rename from Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Parents/ParentsHttpClient.cs
rename to Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/ParentsHttpClient.cs
index 8753a68b14..70c1e0369b 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/Parents/ParentsHttpClient.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/ParentsHttpClient.cs
@@ -8,7 +8,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.HttpClient", Version = "2.0")]
 
-namespace IntegrationTesting.Tests.IntegrationTests.HttpClients.Parents
+namespace IntegrationTesting.Tests.IntegrationTests.HttpClients
 {
     public class ParentsHttpClient : IParentsService
     {
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/PartialCruds/PartialCrudsHttpClient.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/PartialCrudsHttpClient.cs
similarity index 98%
rename from Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/PartialCruds/PartialCrudsHttpClient.cs
rename to Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/PartialCrudsHttpClient.cs
index 97ad9be2e9..a281e73e36 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/PartialCruds/PartialCrudsHttpClient.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/HttpClients/PartialCrudsHttpClient.cs
@@ -8,7 +8,7 @@
 [assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
 [assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.HttpClient", Version = "2.0")]
 
-namespace IntegrationTesting.Tests.IntegrationTests.HttpClients.PartialCruds
+namespace IntegrationTesting.Tests.IntegrationTests.HttpClients
 {
     public class PartialCrudsHttpClient : IPartialCrudsService
     {
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/IntegrationTesting.Tests.IntegrationTests.csproj b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/IntegrationTesting.Tests.IntegrationTests.csproj
index 533836dd22..7084ff76d0 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/IntegrationTesting.Tests.IntegrationTests.csproj
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/IntegrationTesting.Tests.IntegrationTests.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Intent.RoslynWeaver.Attributes" Version="2.1.4" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
     <PackageReference Include="Testcontainers.PostgreSql" Version="3.7.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/CreateDiffIdCommand.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/CreateDiffIdCommand.cs
deleted file mode 100644
index 9f76110901..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/CreateDiffIdCommand.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
-[assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.DtoContract", Version = "2.0")]
-
-namespace IntegrationTesting.Tests.IntegrationTests.Services.DiffIds
-{
-    public class CreateDiffIdCommand
-    {
-        public CreateDiffIdCommand()
-        {
-            Name = null!;
-        }
-
-        public string Name { get; set; }
-
-        public static CreateDiffIdCommand Create(string name)
-        {
-            return new CreateDiffIdCommand
-            {
-                Name = name
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/DeleteDiffIdCommand.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/DeleteDiffIdCommand.cs
deleted file mode 100644
index 8090fe1033..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/DeleteDiffIdCommand.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
-[assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.DtoContract", Version = "2.0")]
-
-namespace IntegrationTesting.Tests.IntegrationTests.Services.DiffIds
-{
-    public class DeleteDiffIdCommand
-    {
-        public Guid MyId { get; set; }
-
-        public static DeleteDiffIdCommand Create(Guid myId)
-        {
-            return new DeleteDiffIdCommand
-            {
-                MyId = myId
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/DiffIdDto.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/DiffIdDto.cs
deleted file mode 100644
index ffa49f22cf..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/DiffIdDto.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
-[assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.DtoContract", Version = "2.0")]
-
-namespace IntegrationTesting.Tests.IntegrationTests.Services.DiffIds
-{
-    public class DiffIdDto
-    {
-        public DiffIdDto()
-        {
-            Name = null!;
-        }
-
-        public Guid Id { get; set; }
-        public string Name { get; set; }
-
-        public static DiffIdDto Create(Guid id, string name)
-        {
-            return new DiffIdDto
-            {
-                Id = id,
-                Name = name
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/GetDiffIdByIdQuery.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/GetDiffIdByIdQuery.cs
deleted file mode 100644
index eee9fac44f..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/GetDiffIdByIdQuery.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
-[assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.DtoContract", Version = "2.0")]
-
-namespace IntegrationTesting.Tests.IntegrationTests.Services.DiffIds
-{
-    public class GetDiffIdByIdQuery
-    {
-        public Guid Id { get; set; }
-
-        public static GetDiffIdByIdQuery Create(Guid id)
-        {
-            return new GetDiffIdByIdQuery
-            {
-                Id = id
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/GetDiffIdsQuery.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/GetDiffIdsQuery.cs
deleted file mode 100644
index f6241dc839..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/GetDiffIdsQuery.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
-[assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.DtoContract", Version = "2.0")]
-
-namespace IntegrationTesting.Tests.IntegrationTests.Services.DiffIds
-{
-    public class GetDiffIdsQuery
-    {
-        public static GetDiffIdsQuery Create()
-        {
-            return new GetDiffIdsQuery
-            {
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/UpdateDiffIdCommand.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/UpdateDiffIdCommand.cs
deleted file mode 100644
index 0f38593c7e..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/UpdateDiffIdCommand.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: DefaultIntentManaged(Mode.Fully, Targets = Targets.Usings)]
-[assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.DtoContract", Version = "2.0")]
-
-namespace IntegrationTesting.Tests.IntegrationTests.Services.DiffIds
-{
-    public class UpdateDiffIdCommand
-    {
-        public UpdateDiffIdCommand()
-        {
-            Name = null!;
-        }
-
-        public Guid MyId { get; set; }
-        public string Name { get; set; }
-
-        public static UpdateDiffIdCommand Create(Guid myId, string name)
-        {
-            return new UpdateDiffIdCommand
-            {
-                MyId = myId,
-                Name = name
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/TestDataFactory.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/TestDataFactory.cs
index 636c6db2bb..d4e14abe7d 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/TestDataFactory.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/TestDataFactory.cs
@@ -1,17 +1,8 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.BadSignatures;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Children;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Customers;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.DiffIds;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.DtoReturns;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Orders;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Parents;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.PartialCruds;
 using IntegrationTesting.Tests.IntegrationTests.Services.BadSignatures;
 using IntegrationTesting.Tests.IntegrationTests.Services.Children;
 using IntegrationTesting.Tests.IntegrationTests.Services.Customers;
-using IntegrationTesting.Tests.IntegrationTests.Services.DiffIds;
 using IntegrationTesting.Tests.IntegrationTests.Services.DtoReturns;
 using IntegrationTesting.Tests.IntegrationTests.Services.Orders;
 using IntegrationTesting.Tests.IntegrationTests.Services.Parents;
@@ -81,17 +72,6 @@ public async Task<Guid> CreateCustomer()
             return customerId;
         }
 
-        public async Task<Guid> CreateDiffId()
-        {
-            var client = new DiffIdsHttpClient(_factory.CreateClient());
-
-            var command = CreateCommand<CreateDiffIdCommand>();
-            var diffIdId = await client.CreateDiffIdAsync(command);
-            _idTracker["DiffIdId"] = diffIdId;
-            _idTracker["MyId"] = diffIdId;
-            return diffIdId;
-        }
-
         public async Task<Guid> CreateDtoReturn()
         {
             var client = new DtoReturnsHttpClient(_factory.CreateClient());
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/BadSignatures/CreateBadSignaturesTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/BadSignatures/CreateBadSignaturesTests.cs
index 578e159924..a3bd6bb9f3 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/BadSignatures/CreateBadSignaturesTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/BadSignatures/CreateBadSignaturesTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.BadSignatures;
 using IntegrationTesting.Tests.IntegrationTests.Services.BadSignatures;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/BadSignatures/GetBadSignaturesByIdTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/BadSignatures/GetBadSignaturesByIdTests.cs
index 915eef18c7..21ce9a6013 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/BadSignatures/GetBadSignaturesByIdTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/BadSignatures/GetBadSignaturesByIdTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.BadSignatures;
 using Intent.RoslynWeaver.Attributes;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/BadSignatures/UpdateBadSignaturesTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/BadSignatures/UpdateBadSignaturesTests.cs
index 526768e4bc..5e06309213 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/BadSignatures/UpdateBadSignaturesTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/BadSignatures/UpdateBadSignaturesTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.BadSignatures;
 using IntegrationTesting.Tests.IntegrationTests.Services.BadSignatures;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Children/CreateChildTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Children/CreateChildTests.cs
index 4edc2292be..0e4e1d2d2a 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Children/CreateChildTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Children/CreateChildTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Children;
 using IntegrationTesting.Tests.IntegrationTests.Services.Children;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Children/DeleteChildTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Children/DeleteChildTests.cs
index 7251b47858..1566f4d16e 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Children/DeleteChildTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Children/DeleteChildTests.cs
@@ -1,7 +1,6 @@
 using System.Net;
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Children;
 using Intent.RoslynWeaver.Attributes;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Children/GetChildByIdTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Children/GetChildByIdTests.cs
index 8a16b86569..4a83064047 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Children/GetChildByIdTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Children/GetChildByIdTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Children;
 using Intent.RoslynWeaver.Attributes;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Children/GetChildrenTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Children/GetChildrenTests.cs
index e5c5a8bac9..c27530e77f 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Children/GetChildrenTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Children/GetChildrenTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Children;
 using Intent.RoslynWeaver.Attributes;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Children/UpdateChildTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Children/UpdateChildTests.cs
index 32f440efcb..ea6b28731a 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Children/UpdateChildTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Children/UpdateChildTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Children;
 using IntegrationTesting.Tests.IntegrationTests.Services.Children;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Customers/CreateCustomerTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Customers/CreateCustomerTests.cs
index b0f06a3934..37d32d46e8 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Customers/CreateCustomerTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Customers/CreateCustomerTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Customers;
 using IntegrationTesting.Tests.IntegrationTests.Services.Customers;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Customers/DeleteCustomerTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Customers/DeleteCustomerTests.cs
index 9792ad074c..c663952fea 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Customers/DeleteCustomerTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Customers/DeleteCustomerTests.cs
@@ -1,7 +1,6 @@
 using System.Net;
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Customers;
 using Intent.RoslynWeaver.Attributes;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Customers/GetCustomerByIdTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Customers/GetCustomerByIdTests.cs
index 1ed563f3d2..c1e82fe169 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Customers/GetCustomerByIdTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Customers/GetCustomerByIdTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Customers;
 using Intent.RoslynWeaver.Attributes;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Customers/GetCustomersTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Customers/GetCustomersTests.cs
index b48975249a..dcaa14153c 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Customers/GetCustomersTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Customers/GetCustomersTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Customers;
 using Intent.RoslynWeaver.Attributes;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Customers/UpdateCustomerTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Customers/UpdateCustomerTests.cs
index 38dbd794e4..5c8d1bf887 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Customers/UpdateCustomerTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Customers/UpdateCustomerTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Customers;
 using IntegrationTesting.Tests.IntegrationTests.Services.Customers;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DiffIds/CreateDiffIdTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DiffIds/CreateDiffIdTests.cs
deleted file mode 100644
index 287c540537..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DiffIds/CreateDiffIdTests.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using AutoFixture;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.DiffIds;
-using IntegrationTesting.Tests.IntegrationTests.Services.DiffIds;
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ServiceEndpointTest", Version = "1.0")]
-
-namespace IntegrationTesting.Tests.IntegrationTests.Tests
-{
-    [IntentManaged(Mode.Merge, Signature = Mode.Fully)]
-    [Collection("SharedContainer")]
-    public class CreateDiffIdTests : BaseIntegrationTest
-    {
-        public CreateDiffIdTests(IntegrationTestWebAppFactory factory) : base(factory)
-        {
-        }
-
-        [Fact]
-        public async Task CreateDiffId_ShouldCreateDiffId()
-        {
-            //Arrange
-            var client = new DiffIdsHttpClient(CreateClient());
-
-            var dataFactory = new TestDataFactory(WebAppFactory);
-
-            var command = dataFactory.CreateCommand<CreateDiffIdCommand>();
-
-            //Act
-            var diffIdId = await client.CreateDiffIdAsync(command);
-
-            //Assert
-            var diffId = await client.GetDiffIdByIdAsync(diffIdId);
-            Assert.NotNull(diffId);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DiffIds/DeleteDiffIdTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DiffIds/DeleteDiffIdTests.cs
deleted file mode 100644
index e9620df609..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DiffIds/DeleteDiffIdTests.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System.Net;
-using AutoFixture;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.DiffIds;
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ServiceEndpointTest", Version = "1.0")]
-
-namespace IntegrationTesting.Tests.IntegrationTests.Tests
-{
-    [IntentManaged(Mode.Merge, Signature = Mode.Fully)]
-    [Collection("SharedContainer")]
-    public class DeleteDiffIdTests : BaseIntegrationTest
-    {
-        public DeleteDiffIdTests(IntegrationTestWebAppFactory factory) : base(factory)
-        {
-        }
-
-        [Fact]
-        public async Task DeleteDiffId_ShouldDeleteDiffId()
-        {
-            //Arrange
-            var client = new DiffIdsHttpClient(CreateClient());
-
-            var dataFactory = new TestDataFactory(WebAppFactory);
-            var diffIdId = await dataFactory.CreateDiffId();
-
-            //Act
-            await client.DeleteDiffIdAsync(diffIdId);
-
-            //Assert
-            var exception = await Assert.ThrowsAsync<HttpClientRequestException>(() => client.GetDiffIdByIdAsync(diffIdId));
-            Assert.Equal(HttpStatusCode.NotFound, exception.StatusCode);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DiffIds/GetDiffIdByIdTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DiffIds/GetDiffIdByIdTests.cs
deleted file mode 100644
index 910e90ae33..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DiffIds/GetDiffIdByIdTests.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using AutoFixture;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.DiffIds;
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ServiceEndpointTest", Version = "1.0")]
-
-namespace IntegrationTesting.Tests.IntegrationTests.Tests
-{
-    [IntentManaged(Mode.Merge, Signature = Mode.Fully)]
-    [Collection("SharedContainer")]
-    public class GetDiffIdByIdTests : BaseIntegrationTest
-    {
-        public GetDiffIdByIdTests(IntegrationTestWebAppFactory factory) : base(factory)
-        {
-        }
-
-        [Fact]
-        public async Task GetDiffIdById_ShouldGetDiffIdById()
-        {
-            //Arrange
-            var client = new DiffIdsHttpClient(CreateClient());
-
-            var dataFactory = new TestDataFactory(WebAppFactory);
-            var diffIdId = await dataFactory.CreateDiffId();
-
-            //Act
-            var diffId = await client.GetDiffIdByIdAsync(diffIdId);
-
-            //Assert
-            Assert.NotNull(diffId);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DiffIds/GetDiffIdsTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DiffIds/GetDiffIdsTests.cs
deleted file mode 100644
index 0d297d2e67..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DiffIds/GetDiffIdsTests.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using AutoFixture;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.DiffIds;
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ServiceEndpointTest", Version = "1.0")]
-
-namespace IntegrationTesting.Tests.IntegrationTests.Tests
-{
-    [IntentManaged(Mode.Merge, Signature = Mode.Fully)]
-    [Collection("SharedContainer")]
-    public class GetDiffIdsTests : BaseIntegrationTest
-    {
-        public GetDiffIdsTests(IntegrationTestWebAppFactory factory) : base(factory)
-        {
-        }
-
-        [Fact]
-        public async Task GetDiffIds_ShouldGetDiffIds()
-        {
-            //Arrange
-            var client = new DiffIdsHttpClient(CreateClient());
-
-            var dataFactory = new TestDataFactory(WebAppFactory);
-            await dataFactory.CreateDiffId();
-
-            //Act
-            var diffIds = await client.GetDiffIdsAsync();
-
-            //Assert
-            Assert.True(diffIds.Count > 0);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DiffIds/UpdateDiffIdTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DiffIds/UpdateDiffIdTests.cs
deleted file mode 100644
index 07d9025598..0000000000
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DiffIds/UpdateDiffIdTests.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using AutoFixture;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.DiffIds;
-using IntegrationTesting.Tests.IntegrationTests.Services.DiffIds;
-using Intent.RoslynWeaver.Attributes;
-
-[assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.AspNetCore.IntegrationTesting.ServiceEndpointTest", Version = "1.0")]
-
-namespace IntegrationTesting.Tests.IntegrationTests.Tests
-{
-    [IntentManaged(Mode.Merge, Signature = Mode.Fully)]
-    [Collection("SharedContainer")]
-    public class UpdateDiffIdTests : BaseIntegrationTest
-    {
-        public UpdateDiffIdTests(IntegrationTestWebAppFactory factory) : base(factory)
-        {
-        }
-
-        [Fact]
-        public async Task UpdateDiffId_ShouldUpdateDiffId()
-        {
-            //Arrange
-            var client = new DiffIdsHttpClient(CreateClient());
-
-            var dataFactory = new TestDataFactory(WebAppFactory);
-            var diffIdId = await dataFactory.CreateDiffId();
-
-            var command = dataFactory.CreateCommand<UpdateDiffIdCommand>();
-            command.MyId = diffIdId;
-
-            //Act
-            await client.UpdateDiffIdAsync(diffIdId, command);
-
-            //Assert
-            var diffId = await client.GetDiffIdByIdAsync(diffIdId);
-            Assert.NotNull(diffId);
-            Assert.Equal(command.Name, diffId.Name);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DtoReturns/CreateDtoReturnTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DtoReturns/CreateDtoReturnTests.cs
index 8d84030d55..5d51f756ea 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DtoReturns/CreateDtoReturnTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DtoReturns/CreateDtoReturnTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.DtoReturns;
 using IntegrationTesting.Tests.IntegrationTests.Services.DtoReturns;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DtoReturns/DeleteDtoReturnTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DtoReturns/DeleteDtoReturnTests.cs
index 8c42f20a98..21de95643e 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DtoReturns/DeleteDtoReturnTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DtoReturns/DeleteDtoReturnTests.cs
@@ -1,7 +1,6 @@
 using System.Net;
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.DtoReturns;
 using Intent.RoslynWeaver.Attributes;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DtoReturns/GetDtoReturnByIdTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DtoReturns/GetDtoReturnByIdTests.cs
index 181eb15372..661a79f65e 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DtoReturns/GetDtoReturnByIdTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DtoReturns/GetDtoReturnByIdTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.DtoReturns;
 using Intent.RoslynWeaver.Attributes;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DtoReturns/GetDtoReturnsTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DtoReturns/GetDtoReturnsTests.cs
index 7dc06f7203..baa0fdd6d4 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DtoReturns/GetDtoReturnsTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DtoReturns/GetDtoReturnsTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.DtoReturns;
 using Intent.RoslynWeaver.Attributes;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DtoReturns/UpdateDtoReturnTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DtoReturns/UpdateDtoReturnTests.cs
index 9c43770dce..e897f14115 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DtoReturns/UpdateDtoReturnTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/DtoReturns/UpdateDtoReturnTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.DtoReturns;
 using IntegrationTesting.Tests.IntegrationTests.Services.DtoReturns;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/CreateOrderOrderItemTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/CreateOrderOrderItemTests.cs
index bc2e37cce8..02820c513d 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/CreateOrderOrderItemTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/CreateOrderOrderItemTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Orders;
 using IntegrationTesting.Tests.IntegrationTests.Services.Orders;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/CreateOrderTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/CreateOrderTests.cs
index 611590aa8d..33b8bd5d77 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/CreateOrderTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/CreateOrderTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Orders;
 using IntegrationTesting.Tests.IntegrationTests.Services.Orders;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/DeleteOrderOrderItemTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/DeleteOrderOrderItemTests.cs
index bf36d9e0b5..1d0c0d7236 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/DeleteOrderOrderItemTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/DeleteOrderOrderItemTests.cs
@@ -1,7 +1,6 @@
 using System.Net;
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Orders;
 using Intent.RoslynWeaver.Attributes;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/DeleteOrderTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/DeleteOrderTests.cs
index 1a874cf40b..8ab908c90d 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/DeleteOrderTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/DeleteOrderTests.cs
@@ -1,7 +1,6 @@
 using System.Net;
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Orders;
 using Intent.RoslynWeaver.Attributes;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/GetOrderByIdTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/GetOrderByIdTests.cs
index da7cb411bf..b6fbba9e8f 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/GetOrderByIdTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/GetOrderByIdTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Orders;
 using Intent.RoslynWeaver.Attributes;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemByIdTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemByIdTests.cs
index ac11d8ed13..055a87c86e 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemByIdTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemByIdTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Orders;
 using Intent.RoslynWeaver.Attributes;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemsTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemsTests.cs
index 16119301ed..d7b26d653b 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemsTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/GetOrderOrderItemsTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Orders;
 using Intent.RoslynWeaver.Attributes;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/GetOrdersTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/GetOrdersTests.cs
index e240f768b4..81e9d2f3d5 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/GetOrdersTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/GetOrdersTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Orders;
 using Intent.RoslynWeaver.Attributes;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/UpdateOrderOrderItemTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/UpdateOrderOrderItemTests.cs
index ff6cdc0d08..a3d0146932 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/UpdateOrderOrderItemTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/UpdateOrderOrderItemTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Orders;
 using IntegrationTesting.Tests.IntegrationTests.Services.Orders;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/UpdateOrderTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/UpdateOrderTests.cs
index b2b2f6dc7a..59fa4ad94d 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/UpdateOrderTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Orders/UpdateOrderTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Orders;
 using IntegrationTesting.Tests.IntegrationTests.Services.Orders;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Parents/CreateParentTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Parents/CreateParentTests.cs
index d1cfdfbcc7..3eaef07622 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Parents/CreateParentTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Parents/CreateParentTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Parents;
 using IntegrationTesting.Tests.IntegrationTests.Services.Parents;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Parents/DeleteParentTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Parents/DeleteParentTests.cs
index e53c7d1419..4428e65cf1 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Parents/DeleteParentTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Parents/DeleteParentTests.cs
@@ -1,7 +1,6 @@
 using System.Net;
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Parents;
 using Intent.RoslynWeaver.Attributes;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Parents/GetParentByIdTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Parents/GetParentByIdTests.cs
index 4b6fd03b9e..c4dc552216 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Parents/GetParentByIdTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Parents/GetParentByIdTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Parents;
 using Intent.RoslynWeaver.Attributes;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Parents/GetParentsTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Parents/GetParentsTests.cs
index cb8b648921..73cadd9bc8 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Parents/GetParentsTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Parents/GetParentsTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Parents;
 using Intent.RoslynWeaver.Attributes;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Parents/UpdateParentTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Parents/UpdateParentTests.cs
index 599a393d11..ec5e29b2b9 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Parents/UpdateParentTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/Parents/UpdateParentTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.Parents;
 using IntegrationTesting.Tests.IntegrationTests.Services.Parents;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/PartialCruds/CreatePartialCrudTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/PartialCruds/CreatePartialCrudTests.cs
index c993c7e3ba..175f006bea 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/PartialCruds/CreatePartialCrudTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/PartialCruds/CreatePartialCrudTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.PartialCruds;
 using IntegrationTesting.Tests.IntegrationTests.Services.PartialCruds;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/PartialCruds/GetPartialCrudByIdTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/PartialCruds/GetPartialCrudByIdTests.cs
index e633f22348..0ac1b6cf02 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/PartialCruds/GetPartialCrudByIdTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/PartialCruds/GetPartialCrudByIdTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.PartialCruds;
 using Intent.RoslynWeaver.Attributes;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/PartialCruds/UpdatePartialCrudTests.cs b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/PartialCruds/UpdatePartialCrudTests.cs
index 190b1582b1..f09b6fb5f6 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/PartialCruds/UpdatePartialCrudTests.cs
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.IntegrationTests/Tests/PartialCruds/UpdatePartialCrudTests.cs
@@ -1,6 +1,5 @@
 using AutoFixture;
 using IntegrationTesting.Tests.IntegrationTests.HttpClients;
-using IntegrationTesting.Tests.IntegrationTests.HttpClients.PartialCruds;
 using IntegrationTesting.Tests.IntegrationTests.Services.PartialCruds;
 using Intent.RoslynWeaver.Attributes;
 
diff --git a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.application.output.log b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.application.output.log
index 058d6837f6..8bdb3439ff 100644
--- a/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.application.output.log
+++ b/Tests/IntegrationTesting.Tests/IntegrationTesting.Tests.application.output.log
@@ -82,14 +82,6 @@
       <ProjectRelativeFilePath>CustomersController.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
-    <FileLog>
-      <ProjectId>68f4fb1c-9cdb-456c-8594-b5d4bc883cd2</ProjectId>
-      <CorrelationId>Intent.AspNetCore.Controllers.Controller#931bc22f-a0d8-43cd-9bdc-55eb2014eca4</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Api/Controllers/DiffIdsController.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIdsController.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
     <FileLog>
       <ProjectId>68f4fb1c-9cdb-456c-8594-b5d4bc883cd2</ProjectId>
       <CorrelationId>Intent.AspNetCore.Controllers.Controller#fa6f57d5-82f6-4cb2-b53f-43d67685bc44</CorrelationId>
@@ -802,142 +794,6 @@
       <ProjectRelativeFilePath>DependencyInjection.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
-    <FileLog>
-      <ProjectId>4735fc39-bb13-4dce-85c2-b5efec2269dc</ProjectId>
-      <CorrelationId>Intent.Application.MediatR.CommandModels#cc51fd39-3d3e-4344-8c01-9d8afa3c1d29</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Application/DiffIds/CreateDiffId/CreateDiffIdCommand.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/CreateDiffId/CreateDiffIdCommand.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>4735fc39-bb13-4dce-85c2-b5efec2269dc</ProjectId>
-      <CorrelationId>Intent.Application.MediatR.CommandHandler#cc51fd39-3d3e-4344-8c01-9d8afa3c1d29</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Application/DiffIds/CreateDiffId/CreateDiffIdCommandHandler.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/CreateDiffId/CreateDiffIdCommandHandler.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>4735fc39-bb13-4dce-85c2-b5efec2269dc</ProjectId>
-      <CorrelationId>Intent.Application.MediatR.FluentValidation.CommandValidator#cc51fd39-3d3e-4344-8c01-9d8afa3c1d29</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Application/DiffIds/CreateDiffId/CreateDiffIdCommandValidator.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/CreateDiffId/CreateDiffIdCommandValidator.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>4735fc39-bb13-4dce-85c2-b5efec2269dc</ProjectId>
-      <CorrelationId>Intent.Application.MediatR.CommandModels#e0d56959-e8ab-400e-bdda-797c71fb53ee</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Application/DiffIds/DeleteDiffId/DeleteDiffIdCommand.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/DeleteDiffId/DeleteDiffIdCommand.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>4735fc39-bb13-4dce-85c2-b5efec2269dc</ProjectId>
-      <CorrelationId>Intent.Application.MediatR.CommandHandler#e0d56959-e8ab-400e-bdda-797c71fb53ee</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Application/DiffIds/DeleteDiffId/DeleteDiffIdCommandHandler.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/DeleteDiffId/DeleteDiffIdCommandHandler.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>4735fc39-bb13-4dce-85c2-b5efec2269dc</ProjectId>
-      <CorrelationId>Intent.Application.MediatR.FluentValidation.CommandValidator#e0d56959-e8ab-400e-bdda-797c71fb53ee</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Application/DiffIds/DeleteDiffId/DeleteDiffIdCommandValidator.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/DeleteDiffId/DeleteDiffIdCommandValidator.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>4735fc39-bb13-4dce-85c2-b5efec2269dc</ProjectId>
-      <CorrelationId>Intent.Application.Dtos.DtoModel#73578a41-93f0-4ddb-b552-a7a035929378</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Application/DiffIds/DiffIdDto.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/DiffIdDto.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>4735fc39-bb13-4dce-85c2-b5efec2269dc</ProjectId>
-      <CorrelationId>Intent.Application.Dtos.AutoMapper.MappingExtensions#73578a41-93f0-4ddb-b552-a7a035929378</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Application/DiffIds/DiffIdDtoMappingExtensions.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/DiffIdDtoMappingExtensions.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>4735fc39-bb13-4dce-85c2-b5efec2269dc</ProjectId>
-      <CorrelationId>Intent.Application.MediatR.QueryModels#efc5dbf3-b7e7-4e08-a0cb-5c2caaa4da78</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Application/DiffIds/GetDiffIdById/GetDiffIdByIdQuery.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/GetDiffIdById/GetDiffIdByIdQuery.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>4735fc39-bb13-4dce-85c2-b5efec2269dc</ProjectId>
-      <CorrelationId>Intent.Application.MediatR.QueryHandler#efc5dbf3-b7e7-4e08-a0cb-5c2caaa4da78</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Application/DiffIds/GetDiffIdById/GetDiffIdByIdQueryHandler.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/GetDiffIdById/GetDiffIdByIdQueryHandler.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>4735fc39-bb13-4dce-85c2-b5efec2269dc</ProjectId>
-      <CorrelationId>Intent.Application.MediatR.FluentValidation.QueryValidator#efc5dbf3-b7e7-4e08-a0cb-5c2caaa4da78</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Application/DiffIds/GetDiffIdById/GetDiffIdByIdQueryValidator.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/GetDiffIdById/GetDiffIdByIdQueryValidator.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>4735fc39-bb13-4dce-85c2-b5efec2269dc</ProjectId>
-      <CorrelationId>Intent.Application.MediatR.QueryModels#ee59ecae-170d-47a4-9a1f-07eba13d6eb4</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Application/DiffIds/GetDiffIds/GetDiffIdsQuery.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/GetDiffIds/GetDiffIdsQuery.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>4735fc39-bb13-4dce-85c2-b5efec2269dc</ProjectId>
-      <CorrelationId>Intent.Application.MediatR.QueryHandler#ee59ecae-170d-47a4-9a1f-07eba13d6eb4</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Application/DiffIds/GetDiffIds/GetDiffIdsQueryHandler.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/GetDiffIds/GetDiffIdsQueryHandler.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>4735fc39-bb13-4dce-85c2-b5efec2269dc</ProjectId>
-      <CorrelationId>Intent.Application.MediatR.FluentValidation.QueryValidator#ee59ecae-170d-47a4-9a1f-07eba13d6eb4</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Application/DiffIds/GetDiffIds/GetDiffIdsQueryValidator.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/GetDiffIds/GetDiffIdsQueryValidator.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>4735fc39-bb13-4dce-85c2-b5efec2269dc</ProjectId>
-      <CorrelationId>Intent.Application.MediatR.CommandModels#9c2c2065-397d-4992-9dd0-f69c9096d5b1</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Application/DiffIds/UpdateDiffId/UpdateDiffIdCommand.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/UpdateDiffId/UpdateDiffIdCommand.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>4735fc39-bb13-4dce-85c2-b5efec2269dc</ProjectId>
-      <CorrelationId>Intent.Application.MediatR.CommandHandler#9c2c2065-397d-4992-9dd0-f69c9096d5b1</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Application/DiffIds/UpdateDiffId/UpdateDiffIdCommandHandler.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/UpdateDiffId/UpdateDiffIdCommandHandler.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>4735fc39-bb13-4dce-85c2-b5efec2269dc</ProjectId>
-      <CorrelationId>Intent.Application.MediatR.FluentValidation.CommandValidator#9c2c2065-397d-4992-9dd0-f69c9096d5b1</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Application/DiffIds/UpdateDiffId/UpdateDiffIdCommandValidator.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/UpdateDiffId/UpdateDiffIdCommandValidator.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
     <FileLog>
       <ProjectId>4735fc39-bb13-4dce-85c2-b5efec2269dc</ProjectId>
       <CorrelationId>Intent.Application.MediatR.CommandModels#2bdcc321-df6f-4ae9-9b1b-3e0e7a688a23</CorrelationId>
@@ -1890,14 +1746,6 @@
       <ProjectRelativeFilePath>Customer.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
-    <FileLog>
-      <ProjectId>0a7a6f49-71ab-4550-bee2-ad6f95dccae8</ProjectId>
-      <CorrelationId>Intent.Entities.DomainEntity#8b77b4cb-29ff-40ca-8a59-66de22b90cb3</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Domain/Entities/DiffId.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffId.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
     <FileLog>
       <ProjectId>0a7a6f49-71ab-4550-bee2-ad6f95dccae8</ProjectId>
       <CorrelationId>Intent.Entities.DomainEntity#5c0eec88-edb1-439b-b778-cf1f927268be</CorrelationId>
@@ -1994,14 +1842,6 @@
       <ProjectRelativeFilePath>ICustomerRepository.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
-    <FileLog>
-      <ProjectId>0bd2c8ef-87e5-48ec-aab2-e15aa8773c87</ProjectId>
-      <CorrelationId>Intent.Entities.Repositories.Api.EntityRepositoryInterface#8b77b4cb-29ff-40ca-8a59-66de22b90cb3</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Domain/Repositories/IDiffIdRepository.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>IDiffIdRepository.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
     <FileLog>
       <ProjectId>0bd2c8ef-87e5-48ec-aab2-e15aa8773c87</ProjectId>
       <CorrelationId>Intent.Entities.Repositories.Api.EntityRepositoryInterface#5c0eec88-edb1-439b-b778-cf1f927268be</CorrelationId>
@@ -2138,14 +1978,6 @@
       <ProjectRelativeFilePath>CustomerConfiguration.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
-    <FileLog>
-      <ProjectId>b019a06f-0542-4575-97c9-60f9e54aedb9</ProjectId>
-      <CorrelationId>Intent.EntityFrameworkCore.EntityTypeConfiguration#8b77b4cb-29ff-40ca-8a59-66de22b90cb3</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Infrastructure/Persistence/Configurations/DiffIdConfiguration.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIdConfiguration.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
     <FileLog>
       <ProjectId>b019a06f-0542-4575-97c9-60f9e54aedb9</ProjectId>
       <CorrelationId>Intent.EntityFrameworkCore.EntityTypeConfiguration#5c0eec88-edb1-439b-b778-cf1f927268be</CorrelationId>
@@ -2234,14 +2066,6 @@
       <ProjectRelativeFilePath>CustomerRepository.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
-    <FileLog>
-      <ProjectId>a5dadd94-25e7-46b1-9df2-837e5af379ed</ProjectId>
-      <CorrelationId>Intent.EntityFrameworkCore.Repositories.Repository#8b77b4cb-29ff-40ca-8a59-66de22b90cb3</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.Infrastructure/Repositories/DiffIdRepository.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIdRepository.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
     <FileLog>
       <ProjectId>a5dadd94-25e7-46b1-9df2-837e5af379ed</ProjectId>
       <CorrelationId>Intent.EntityFrameworkCore.Repositories.Repository#5c0eec88-edb1-439b-b778-cf1f927268be</CorrelationId>
@@ -2342,168 +2166,152 @@
       <ProjectId>ae6542fd-a9ba-4d27-9533-4e62d9eb18f8</ProjectId>
       <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#0a9a787f-e5d0-4789-83f2-3811a890ef8c</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/BadSignatures/BadSignaturesHttpClient.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>BadSignatures/BadSignaturesHttpClient.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>ae6542fd-a9ba-4d27-9533-4e62d9eb18f8</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#0a9a787f-e5d0-4789-83f2-3811a890ef8c</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/BadSignatures/IBadSignaturesService.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>BadSignatures/IBadSignaturesService.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/BadSignaturesHttpClient.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>BadSignaturesHttpClient.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>ae6542fd-a9ba-4d27-9533-4e62d9eb18f8</ProjectId>
       <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#17e4e577-b053-4c1c-a433-e552079175a7</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/Children/ChildrenHttpClient.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Children/ChildrenHttpClient.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/ChildrenHttpClient.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>ChildrenHttpClient.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>ae6542fd-a9ba-4d27-9533-4e62d9eb18f8</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#17e4e577-b053-4c1c-a433-e552079175a7</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#0880fd7d-223d-4174-9365-e76d4320a242</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/Children/IChildrenService.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Children/IChildrenService.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/CustomersHttpClient.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>CustomersHttpClient.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>ae6542fd-a9ba-4d27-9533-4e62d9eb18f8</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#0880fd7d-223d-4174-9365-e76d4320a242</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#fa6f57d5-82f6-4cb2-b53f-43d67685bc44</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/Customers/CustomersHttpClient.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Customers/CustomersHttpClient.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/DtoReturnsHttpClient.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>DtoReturnsHttpClient.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>ae6542fd-a9ba-4d27-9533-4e62d9eb18f8</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#0880fd7d-223d-4174-9365-e76d4320a242</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClientRequestException</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/Customers/ICustomersService.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Customers/ICustomersService.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/HttpClientRequestException.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>HttpClientRequestException.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>ae6542fd-a9ba-4d27-9533-4e62d9eb18f8</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#931bc22f-a0d8-43cd-9bdc-55eb2014eca4</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#0a9a787f-e5d0-4789-83f2-3811a890ef8c</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/DiffIds/DiffIdsHttpClient.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/DiffIdsHttpClient.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/IBadSignaturesService.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>IBadSignaturesService.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>ae6542fd-a9ba-4d27-9533-4e62d9eb18f8</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#931bc22f-a0d8-43cd-9bdc-55eb2014eca4</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#17e4e577-b053-4c1c-a433-e552079175a7</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/DiffIds/IDiffIdsService.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/IDiffIdsService.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/IChildrenService.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>IChildrenService.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>ae6542fd-a9ba-4d27-9533-4e62d9eb18f8</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#fa6f57d5-82f6-4cb2-b53f-43d67685bc44</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#0880fd7d-223d-4174-9365-e76d4320a242</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/DtoReturns/DtoReturnsHttpClient.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DtoReturns/DtoReturnsHttpClient.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/ICustomersService.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>ICustomersService.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>ae6542fd-a9ba-4d27-9533-4e62d9eb18f8</ProjectId>
       <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#fa6f57d5-82f6-4cb2-b53f-43d67685bc44</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/DtoReturns/IDtoReturnsService.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DtoReturns/IDtoReturnsService.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/IDtoReturnsService.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>IDtoReturnsService.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>ae6542fd-a9ba-4d27-9533-4e62d9eb18f8</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClientRequestException</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#00614199-0d6f-4d44-994a-092d7c1eb6c5</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/HttpClientRequestException.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>HttpClientRequestException.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/INoReturnsService.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>INoReturnsService.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>ae6542fd-a9ba-4d27-9533-4e62d9eb18f8</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#a7b1f487-5348-4002-b066-74fdd61ee6fb</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#ed136759-e818-4087-ac19-25b040b6bd4f</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/IProductsService.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>IProductsService.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/IOrdersService.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>IOrdersService.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>ae6542fd-a9ba-4d27-9533-4e62d9eb18f8</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.JsonResponse</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#083cd3b0-04d5-42e1-9818-09299dd30289</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/JsonResponse.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>JsonResponse.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/IParentsService.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>IParentsService.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>ae6542fd-a9ba-4d27-9533-4e62d9eb18f8</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#00614199-0d6f-4d44-994a-092d7c1eb6c5</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#4086b854-1cf3-46b8-9ace-ca2c781e57ca</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/NoReturns/INoReturnsService.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>NoReturns/INoReturnsService.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/IPartialCrudsService.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>IPartialCrudsService.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>ae6542fd-a9ba-4d27-9533-4e62d9eb18f8</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#00614199-0d6f-4d44-994a-092d7c1eb6c5</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#a7b1f487-5348-4002-b066-74fdd61ee6fb</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/NoReturns/NoReturnsHttpClient.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>NoReturns/NoReturnsHttpClient.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/IProductsService.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>IProductsService.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>ae6542fd-a9ba-4d27-9533-4e62d9eb18f8</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#ed136759-e818-4087-ac19-25b040b6bd4f</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.JsonResponse</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/Orders/IOrdersService.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Orders/IOrdersService.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/JsonResponse.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>JsonResponse.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>ae6542fd-a9ba-4d27-9533-4e62d9eb18f8</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#ed136759-e818-4087-ac19-25b040b6bd4f</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#00614199-0d6f-4d44-994a-092d7c1eb6c5</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/Orders/OrdersHttpClient.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Orders/OrdersHttpClient.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/NoReturnsHttpClient.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>NoReturnsHttpClient.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>ae6542fd-a9ba-4d27-9533-4e62d9eb18f8</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#083cd3b0-04d5-42e1-9818-09299dd30289</CorrelationId>
+      <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#ed136759-e818-4087-ac19-25b040b6bd4f</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/Parents/IParentsService.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Parents/IParentsService.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/OrdersHttpClient.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>OrdersHttpClient.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>ae6542fd-a9ba-4d27-9533-4e62d9eb18f8</ProjectId>
       <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#083cd3b0-04d5-42e1-9818-09299dd30289</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/Parents/ParentsHttpClient.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Parents/ParentsHttpClient.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>ae6542fd-a9ba-4d27-9533-4e62d9eb18f8</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ProxyServiceContract#4086b854-1cf3-46b8-9ace-ca2c781e57ca</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/PartialCruds/IPartialCrudsService.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>PartialCruds/IPartialCrudsService.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/ParentsHttpClient.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>ParentsHttpClient.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>ae6542fd-a9ba-4d27-9533-4e62d9eb18f8</ProjectId>
       <CorrelationId>Intent.AspNetCore.IntegrationTesting.HttpClient#4086b854-1cf3-46b8-9ace-ca2c781e57ca</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/PartialCruds/PartialCrudsHttpClient.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>PartialCruds/PartialCrudsHttpClient.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/HttpClients/PartialCrudsHttpClient.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>PartialCrudsHttpClient.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
@@ -2682,54 +2490,6 @@
       <ProjectRelativeFilePath>Services/Customers/UpdateCustomerCommand.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
-    <FileLog>
-      <ProjectId>fda9375f-9964-43cf-9ff4-dbb6a285027c</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.DtoContract#cc51fd39-3d3e-4344-8c01-9d8afa3c1d29</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/CreateDiffIdCommand.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Services/DiffIds/CreateDiffIdCommand.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>fda9375f-9964-43cf-9ff4-dbb6a285027c</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.DtoContract#e0d56959-e8ab-400e-bdda-797c71fb53ee</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/DeleteDiffIdCommand.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Services/DiffIds/DeleteDiffIdCommand.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>fda9375f-9964-43cf-9ff4-dbb6a285027c</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.DtoContract#73578a41-93f0-4ddb-b552-a7a035929378</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/DiffIdDto.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Services/DiffIds/DiffIdDto.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>fda9375f-9964-43cf-9ff4-dbb6a285027c</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.DtoContract#efc5dbf3-b7e7-4e08-a0cb-5c2caaa4da78</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/GetDiffIdByIdQuery.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Services/DiffIds/GetDiffIdByIdQuery.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>fda9375f-9964-43cf-9ff4-dbb6a285027c</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.DtoContract#ee59ecae-170d-47a4-9a1f-07eba13d6eb4</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/GetDiffIdsQuery.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Services/DiffIds/GetDiffIdsQuery.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>fda9375f-9964-43cf-9ff4-dbb6a285027c</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.DtoContract#9c2c2065-397d-4992-9dd0-f69c9096d5b1</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/Services/DiffIds/UpdateDiffIdCommand.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>Services/DiffIds/UpdateDiffIdCommand.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
     <FileLog>
       <ProjectId>fda9375f-9964-43cf-9ff4-dbb6a285027c</ProjectId>
       <CorrelationId>Intent.AspNetCore.IntegrationTesting.DtoContract#2bdcc321-df6f-4ae9-9b1b-3e0e7a688a23</CorrelationId>
@@ -3186,46 +2946,6 @@
       <ProjectRelativeFilePath>Customers/UpdateCustomerTests.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
-    <FileLog>
-      <ProjectId>d3d3e59b-761c-47db-b174-c17872941e92</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ServiceEndpointTest#cc51fd39-3d3e-4344-8c01-9d8afa3c1d29</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/Tests/DiffIds/CreateDiffIdTests.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/CreateDiffIdTests.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>d3d3e59b-761c-47db-b174-c17872941e92</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ServiceEndpointTest#e0d56959-e8ab-400e-bdda-797c71fb53ee</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/Tests/DiffIds/DeleteDiffIdTests.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/DeleteDiffIdTests.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>d3d3e59b-761c-47db-b174-c17872941e92</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ServiceEndpointTest#efc5dbf3-b7e7-4e08-a0cb-5c2caaa4da78</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/Tests/DiffIds/GetDiffIdByIdTests.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/GetDiffIdByIdTests.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>d3d3e59b-761c-47db-b174-c17872941e92</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ServiceEndpointTest#ee59ecae-170d-47a4-9a1f-07eba13d6eb4</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/Tests/DiffIds/GetDiffIdsTests.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/GetDiffIdsTests.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
-    <FileLog>
-      <ProjectId>d3d3e59b-761c-47db-b174-c17872941e92</ProjectId>
-      <CorrelationId>Intent.AspNetCore.IntegrationTesting.ServiceEndpointTest#9c2c2065-397d-4992-9dd0-f69c9096d5b1</CorrelationId>
-      <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>IntegrationTesting.Tests.IntegrationTests/Tests/DiffIds/UpdateDiffIdTests.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>DiffIds/UpdateDiffIdTests.cs</ProjectRelativeFilePath>
-      <IsIgnored>false</IsIgnored>
-    </FileLog>
     <FileLog>
       <ProjectId>d3d3e59b-761c-47db-b174-c17872941e92</ProjectId>
       <CorrelationId>Intent.AspNetCore.IntegrationTesting.ServiceEndpointTest#2bdcc321-df6f-4ae9-9b1b-3e0e7a688a23</CorrelationId>
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Domain/IntegrationTesting.Tests.Domain/Diagrams/b55ccdec-1d54-4a1a-b101-f2558e00dce0/ClassVisuals/8b77b4cb-29ff-40ca-8a59-66de22b90cb3.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Domain/IntegrationTesting.Tests.Domain/Diagrams/b55ccdec-1d54-4a1a-b101-f2558e00dce0/ClassVisuals/8b77b4cb-29ff-40ca-8a59-66de22b90cb3.xml
deleted file mode 100644
index d299d45d48..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Domain/IntegrationTesting.Tests.Domain/Diagrams/b55ccdec-1d54-4a1a-b101-f2558e00dce0/ClassVisuals/8b77b4cb-29ff-40ca-8a59-66de22b90cb3.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<classVisual id="8b77b4cb-29ff-40ca-8a59-66de22b90cb3" zIndex="17">
-  <position x="100" y="400" />
-  <size width="200" height="80" />
-  <autoResizeEnabled>true</autoResizeEnabled>
-</classVisual>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Domain/IntegrationTesting.Tests.Domain/Elements/Class/DiffId__g2fhv41k.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Domain/IntegrationTesting.Tests.Domain/Elements/Class/DiffId__g2fhv41k.xml
deleted file mode 100644
index b32b8751fc..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Domain/IntegrationTesting.Tests.Domain/Elements/Class/DiffId__g2fhv41k.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<class id="8b77b4cb-29ff-40ca-8a59-66de22b90cb3" type="Class" typeId="04e12b51-ed12-42a3-9667-a6aa81bb6d10">
-  <name>DiffId</name>
-  <display>DiffId</display>
-  <isAbstract>false</isAbstract>
-  <sort-children>by-type-then-manually</sort-children>
-  <genericTypes />
-  <isMapped>false</isMapped>
-  <parentFolderId>086ea1d7-21ff-4b2f-89af-27f09033705a</parentFolderId>
-  <packageId>086ea1d7-21ff-4b2f-89af-27f09033705a</packageId>
-  <packageName>IntegrationTesting.Tests.Domain</packageName>
-  <stereotypes />
-  <metadata />
-  <childElements>
-    <childElement id="d2d0ba63-cd81-47ce-8421-3562b20df1ce" type="Attribute" typeId="0090fb93-483e-41af-a11d-5ad2dc796adf">
-      <name>Id</name>
-      <display>Id: guid</display>
-      <isAbstract>false</isAbstract>
-      <genericTypes />
-      <typeReference id="238fe77d-570f-4fe7-ad16-92fe574eca8b">
-        <typeId>6b649125-18ea-48fd-a6ba-0bfff0d8f488</typeId>
-        <isNavigable>true</isNavigable>
-        <isNullable>false</isNullable>
-        <isCollection>false</isCollection>
-        <isRequired>true</isRequired>
-        <typePackageName>Intent.Common.Types</typePackageName>
-        <typePackageId>870ad967-cbd4-4ea9-b86d-9c3a5d55ea67</typePackageId>
-        <stereotypes />
-        <genericTypeParameters />
-      </typeReference>
-      <isMapped>false</isMapped>
-      <parentFolderId>8b77b4cb-29ff-40ca-8a59-66de22b90cb3</parentFolderId>
-      <packageId>086ea1d7-21ff-4b2f-89af-27f09033705a</packageId>
-      <packageName>IntegrationTesting.Tests.Domain</packageName>
-      <stereotypes>
-        <stereotype stereotypeDefinitionId="b99aac21-9ca4-467f-a3a6-046255a9eed6" name="Primary Key">
-          <addedByDefault>false</addedByDefault>
-          <definitionPackageName>Intent.Metadata.RDBMS</definitionPackageName>
-          <definitionPackageId>AF8F3810-745C-42A2-93C8-798860DC45B1</definitionPackageId>
-          <properties>
-            <property name="4c1e3f7e-61d4-460d-bd20-c2edbc0c0e2e" display="Identity" value="false" isActive="true" />
-            <property name="a7a5e921-18b9-43b4-8078-b4ac4e5dae6f" display="Data source" value="Default" isActive="true" />
-          </properties>
-        </stereotype>
-      </stereotypes>
-      <metadata>
-        <entry key="is-managed-key" value="true" />
-      </metadata>
-      <childElements />
-    </childElement>
-    <childElement id="b5d8624f-5cad-4ea9-9d66-020546b67e89" type="Attribute" typeId="0090fb93-483e-41af-a11d-5ad2dc796adf">
-      <name>Name</name>
-      <display>Name: string</display>
-      <isAbstract>false</isAbstract>
-      <genericTypes />
-      <typeReference id="24c1fc40-8ba7-464c-89b5-6411abdcdbf1">
-        <typeId>d384db9c-a279-45e1-801e-e4e8099625f2</typeId>
-        <isNavigable>true</isNavigable>
-        <isNullable>false</isNullable>
-        <isCollection>false</isCollection>
-        <isRequired>true</isRequired>
-        <typePackageName>Intent.Common.Types</typePackageName>
-        <typePackageId>870ad967-cbd4-4ea9-b86d-9c3a5d55ea67</typePackageId>
-        <stereotypes />
-        <genericTypeParameters />
-      </typeReference>
-      <isMapped>false</isMapped>
-      <parentFolderId>8b77b4cb-29ff-40ca-8a59-66de22b90cb3</parentFolderId>
-      <packageId>086ea1d7-21ff-4b2f-89af-27f09033705a</packageId>
-      <packageName>IntegrationTesting.Tests.Domain</packageName>
-      <stereotypes>
-        <stereotype stereotypeDefinitionId="6347286E-A637-44D6-A5D7-D9BE5789CA7A" name="Text Constraints">
-          <addedByDefault>false</addedByDefault>
-          <definitionPackageName>Intent.Metadata.RDBMS</definitionPackageName>
-          <definitionPackageId>AF8F3810-745C-42A2-93C8-798860DC45B1</definitionPackageId>
-          <properties>
-            <property name="1288cfcd-ee51-437e-9713-73b80118f026" display="SQL Data Type" value="DEFAULT" isActive="true" />
-            <property name="A04CC24D-81FB-4EA2-A34A-B3C58E04DCFD" display="MaxLength" isActive="true" />
-            <property name="67EC4CF4-7706-4B39-BC7C-DF539EE2B0AF" display="IsUnicode" value="false" isActive="true" />
-          </properties>
-        </stereotype>
-      </stereotypes>
-      <metadata />
-      <childElements />
-    </childElement>
-  </childElements>
-</class>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Associations/Create Entity Action/CreateDiffIdCommand_to_diffId__7l0v008d.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Associations/Create Entity Action/CreateDiffIdCommand_to_diffId__7l0v008d.xml
deleted file mode 100644
index 57f1f5dae5..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Associations/Create Entity Action/CreateDiffIdCommand_to_diffId__7l0v008d.xml	
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<association id="76b5b26d-f941-43d5-9eed-680a8bd8f882">
-  <sourceEnd id="eeeb261e-64cb-4992-b718-13d07d96b2e2" type="Create Entity Action Source End" typeId="a3e7c59e-b0a1-47e1-ba29-66f2c7047b0a">
-    <display>created by : DiffIds.CreateDiffIdCommand</display>
-    <order>0</order>
-    <typeReference id="c29606f4-bd2d-44ab-9c8b-90936e2b06aa">
-      <typeId>cc51fd39-3d3e-4344-8c01-9d8afa3c1d29</typeId>
-      <isNavigable>true</isNavigable>
-      <isNullable>false</isNullable>
-      <isCollection>false</isCollection>
-      <isRequired>true</isRequired>
-      <typePackageName>IntegrationTesting.Tests.Services</typePackageName>
-      <typePackageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</typePackageId>
-      <stereotypes />
-      <genericTypeParameters />
-    </typeReference>
-    <stereotypes />
-    <metadata />
-    <childElements />
-  </sourceEnd>
-  <targetEnd id="76b5b26d-f941-43d5-9eed-680a8bd8f882" type="Create Entity Action Target End" typeId="328f54e5-7bad-4b5f-90ca-03ce3105d016">
-    <name>diffId</name>
-    <display>[create] diffId: DiffId</display>
-    <order>1</order>
-    <typeReference id="0033fa0c-7dd0-4179-81a5-30e6b24d9809">
-      <typeId>8b77b4cb-29ff-40ca-8a59-66de22b90cb3</typeId>
-      <isNavigable>true</isNavigable>
-      <isNullable>false</isNullable>
-      <isCollection>false</isCollection>
-      <isRequired>true</isRequired>
-      <typePackageName>IntegrationTesting.Tests.Domain</typePackageName>
-      <typePackageId>086ea1d7-21ff-4b2f-89af-27f09033705a</typePackageId>
-      <stereotypes />
-      <genericTypeParameters />
-    </typeReference>
-    <stereotypes />
-    <mappings>
-      <mapping type="Create Entity Mapping" typeId="5f172141-fdba-426b-980e-163e782ff53e">
-        <source applicationId="2d1629af-eb4d-4434-b187-03ea5c1ca294" designerId="81104ae6-2bc5-4bae-b05a-f987b0372d81" elementId="cc51fd39-3d3e-4344-8c01-9d8afa3c1d29" location="[IntegrationTesting.Tests].[Services].[CreateDiffIdCommand]" />
-        <target applicationId="2d1629af-eb4d-4434-b187-03ea5c1ca294" designerId="6ab29b31-27af-4f56-a67c-986d82097d63" elementId="8b77b4cb-29ff-40ca-8a59-66de22b90cb3" location="[IntegrationTesting.Tests].[Services].[DiffId]" />
-        <mappedEnds>
-          <mappedEnd>
-            <expression>{CreateDiffIdCommand}</expression>
-            <path>
-              <target id="8b77b4cb-29ff-40ca-8a59-66de22b90cb3" name="DiffId" type="element" specialization="Class" />
-            </path>
-            <sources>
-              <source identifier="CreateDiffIdCommand" mappingType="Invocation Mapping" mappingTypeId="47dc4a51-30a3-4ee8-8c7d-25a35bb965b9">
-                <path>
-                  <target id="cc51fd39-3d3e-4344-8c01-9d8afa3c1d29" name="CreateDiffIdCommand" type="element" specialization="Command" />
-                </path>
-              </source>
-            </sources>
-          </mappedEnd>
-          <mappedEnd>
-            <expression>{Name}</expression>
-            <path>
-              <target id="8b77b4cb-29ff-40ca-8a59-66de22b90cb3" name="DiffId" type="element" specialization="Class" />
-              <target id="b5d8624f-5cad-4ea9-9d66-020546b67e89" name="Name" type="element" specialization="Attribute" />
-            </path>
-            <sources>
-              <source identifier="Name" mappingType="Data Mapping" mappingTypeId="50dccfb2-bd24-4135-adf6-ed31f28f8fe0">
-                <path>
-                  <target id="cc51fd39-3d3e-4344-8c01-9d8afa3c1d29" name="CreateDiffIdCommand" type="element" specialization="Command" />
-                  <target id="b128dd80-8686-470b-8c4a-fdaf2312c01e" name="Name" type="element" specialization="DTO-Field" />
-                </path>
-              </source>
-            </sources>
-          </mappedEnd>
-        </mappedEnds>
-      </mapping>
-    </mappings>
-    <metadata />
-    <childElements />
-  </targetEnd>
-  <associationType>Create Entity Action</associationType>
-  <associationTypeId>7a3f0474-3cf8-4249-baac-8c07c49465e0</associationTypeId>
-  <stereotypes />
-</association>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Associations/Delete Entity Action/DeleteDiffIdCommand_to_diffId__5yjr4p2l.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Associations/Delete Entity Action/DeleteDiffIdCommand_to_diffId__5yjr4p2l.xml
deleted file mode 100644
index 9b9208712c..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Associations/Delete Entity Action/DeleteDiffIdCommand_to_diffId__5yjr4p2l.xml	
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<association id="7d2e2256-b662-4fa2-b3a9-5e214e5c79ce">
-  <sourceEnd id="c27d28b8-c902-4400-8a28-ffb1561e91c7" type="Delete Entity Action Source End" typeId="8c2d9fed-bd14-44b2-9f98-8a801aaf157e">
-    <display>deleted by : DiffIds.DeleteDiffIdCommand</display>
-    <order>0</order>
-    <typeReference id="305dcece-67a6-4b6a-9217-c82b26a38435">
-      <typeId>e0d56959-e8ab-400e-bdda-797c71fb53ee</typeId>
-      <isNavigable>true</isNavigable>
-      <isNullable>false</isNullable>
-      <isCollection>false</isCollection>
-      <isRequired>true</isRequired>
-      <typePackageName>IntegrationTesting.Tests.Services</typePackageName>
-      <typePackageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</typePackageId>
-      <stereotypes />
-      <genericTypeParameters />
-    </typeReference>
-    <stereotypes />
-    <metadata />
-    <childElements />
-  </sourceEnd>
-  <targetEnd id="7d2e2256-b662-4fa2-b3a9-5e214e5c79ce" type="Delete Entity Action Target End" typeId="4a04cfc2-5841-438c-9c16-fb58b784b365">
-    <name>diffId</name>
-    <display>[delete] diffId: DiffId</display>
-    <order>1</order>
-    <typeReference id="a2967b2e-bdb9-460d-804f-da2d2f319491">
-      <typeId>8b77b4cb-29ff-40ca-8a59-66de22b90cb3</typeId>
-      <isNavigable>true</isNavigable>
-      <isNullable>false</isNullable>
-      <isCollection>false</isCollection>
-      <isRequired>true</isRequired>
-      <typePackageName>IntegrationTesting.Tests.Domain</typePackageName>
-      <typePackageId>086ea1d7-21ff-4b2f-89af-27f09033705a</typePackageId>
-      <stereotypes />
-      <genericTypeParameters />
-    </typeReference>
-    <stereotypes />
-    <mappings>
-      <mapping type="Query Entity Mapping" typeId="25f25af9-c38b-4053-9474-b0fabe9d7ea7">
-        <source applicationId="2d1629af-eb4d-4434-b187-03ea5c1ca294" designerId="81104ae6-2bc5-4bae-b05a-f987b0372d81" elementId="e0d56959-e8ab-400e-bdda-797c71fb53ee" location="[IntegrationTesting.Tests].[Services].[DeleteDiffIdCommand]" />
-        <target applicationId="2d1629af-eb4d-4434-b187-03ea5c1ca294" designerId="6ab29b31-27af-4f56-a67c-986d82097d63" elementId="8b77b4cb-29ff-40ca-8a59-66de22b90cb3" location="[IntegrationTesting.Tests].[Services].[DiffId]" />
-        <mappedEnds>
-          <mappedEnd>
-            <expression>{MyId}</expression>
-            <path>
-              <target id="8b77b4cb-29ff-40ca-8a59-66de22b90cb3" name="DiffId" type="element" specialization="Class" />
-              <target id="d2d0ba63-cd81-47ce-8421-3562b20df1ce" name="Id" type="element" specialization="Attribute" />
-            </path>
-            <sources>
-              <source identifier="MyId" mappingType="Filter Mapping" mappingTypeId="01d09a7f-0e7c-4670-b7bc-395d7e893ef2">
-                <path>
-                  <target id="e0d56959-e8ab-400e-bdda-797c71fb53ee" name="DeleteDiffIdCommand" type="element" specialization="Command" />
-                  <target id="506d8cac-bdee-43bf-bd46-1303acd57f0e" name="MyId" type="element" specialization="DTO-Field" />
-                </path>
-              </source>
-            </sources>
-          </mappedEnd>
-        </mappedEnds>
-      </mapping>
-    </mappings>
-    <metadata />
-    <childElements />
-  </targetEnd>
-  <associationType>Delete Entity Action</associationType>
-  <associationTypeId>bfc823fb-60ab-451d-ba62-12671fe7e28e</associationTypeId>
-  <stereotypes />
-</association>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Associations/Query Entity Action/GetDiffIdByIdQuery_to_diffId__gl92dl6t.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Associations/Query Entity Action/GetDiffIdByIdQuery_to_diffId__gl92dl6t.xml
deleted file mode 100644
index 56cb399a6a..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Associations/Query Entity Action/GetDiffIdByIdQuery_to_diffId__gl92dl6t.xml	
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<association id="362c1bd3-ddbd-44a1-aa26-07604cc9d816">
-  <sourceEnd id="5bdd6456-d982-453b-9419-85cba9f9751d" type="Query Entity Action Source End" typeId="32a65f26-2555-4616-8a2c-6a90805600bb">
-    <display>: GetDiffIdByIdQuery</display>
-    <order>0</order>
-    <typeReference id="5f6488be-fec5-4540-99c0-22081f8170f1">
-      <typeId>efc5dbf3-b7e7-4e08-a0cb-5c2caaa4da78</typeId>
-      <isNavigable>false</isNavigable>
-      <isNullable>false</isNullable>
-      <isCollection>false</isCollection>
-      <isRequired>true</isRequired>
-      <typePackageName>IntegrationTesting.Tests.Services</typePackageName>
-      <typePackageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</typePackageId>
-      <stereotypes />
-      <genericTypeParameters />
-    </typeReference>
-    <stereotypes />
-    <metadata />
-    <childElements />
-  </sourceEnd>
-  <targetEnd id="362c1bd3-ddbd-44a1-aa26-07604cc9d816" type="Query Entity Action Target End" typeId="93ef6675-cba4-4998-adff-cb22d5343ed4">
-    <name>diffId</name>
-    <display>[query] diffId: DiffId</display>
-    <order>1</order>
-    <typeReference id="aee851b9-55af-4f97-81be-08e387dfd113">
-      <typeId>8b77b4cb-29ff-40ca-8a59-66de22b90cb3</typeId>
-      <isNavigable>true</isNavigable>
-      <isNullable>false</isNullable>
-      <isCollection>false</isCollection>
-      <isRequired>true</isRequired>
-      <typePackageName>IntegrationTesting.Tests.Domain</typePackageName>
-      <typePackageId>086ea1d7-21ff-4b2f-89af-27f09033705a</typePackageId>
-      <stereotypes />
-      <genericTypeParameters />
-    </typeReference>
-    <stereotypes />
-    <mappings>
-      <mapping type="Query Entity Mapping" typeId="25f25af9-c38b-4053-9474-b0fabe9d7ea7">
-        <source applicationId="2d1629af-eb4d-4434-b187-03ea5c1ca294" designerId="81104ae6-2bc5-4bae-b05a-f987b0372d81" elementId="efc5dbf3-b7e7-4e08-a0cb-5c2caaa4da78" location="[IntegrationTesting.Tests].[Services].[GetDiffIdByIdQuery]" />
-        <target applicationId="2d1629af-eb4d-4434-b187-03ea5c1ca294" designerId="6ab29b31-27af-4f56-a67c-986d82097d63" elementId="8b77b4cb-29ff-40ca-8a59-66de22b90cb3" location="[IntegrationTesting.Tests].[Services].[DiffId]" />
-        <mappedEnds>
-          <mappedEnd>
-            <expression>{Id}</expression>
-            <path>
-              <target id="8b77b4cb-29ff-40ca-8a59-66de22b90cb3" name="DiffId" type="element" specialization="Class" />
-              <target id="d2d0ba63-cd81-47ce-8421-3562b20df1ce" name="Id" type="element" specialization="Attribute" />
-            </path>
-            <sources>
-              <source identifier="Id" mappingType="Filter Mapping" mappingTypeId="01d09a7f-0e7c-4670-b7bc-395d7e893ef2">
-                <path>
-                  <target id="efc5dbf3-b7e7-4e08-a0cb-5c2caaa4da78" name="GetDiffIdByIdQuery" type="element" specialization="Query" />
-                  <target id="8cf74582-d2be-4ad2-b011-b32043963a8c" name="Id" type="element" specialization="DTO-Field" />
-                </path>
-              </source>
-            </sources>
-          </mappedEnd>
-        </mappedEnds>
-      </mapping>
-    </mappings>
-    <metadata />
-    <childElements />
-  </targetEnd>
-  <associationType>Query Entity Action</associationType>
-  <associationTypeId>47ab5888-a258-4bec-a9fc-a83de69eb79d</associationTypeId>
-  <stereotypes />
-</association>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Associations/Query Entity Action/GetDiffIdsQuery_to_diffIds__glf3tsyx.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Associations/Query Entity Action/GetDiffIdsQuery_to_diffIds__glf3tsyx.xml
deleted file mode 100644
index df3f6494c5..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Associations/Query Entity Action/GetDiffIdsQuery_to_diffIds__glf3tsyx.xml	
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<association id="8bc42ad3-a792-4a6d-9eb7-db035d1f93ef">
-  <sourceEnd id="5404fdb7-66cd-4e8a-8877-a7475628b396" type="Query Entity Action Source End" typeId="32a65f26-2555-4616-8a2c-6a90805600bb">
-    <display>: GetDiffIdsQuery</display>
-    <order>0</order>
-    <typeReference id="16fda4dc-9fa0-4e4a-b3b5-b42da7eb8fa6">
-      <typeId>ee59ecae-170d-47a4-9a1f-07eba13d6eb4</typeId>
-      <isNavigable>false</isNavigable>
-      <isNullable>false</isNullable>
-      <isCollection>false</isCollection>
-      <isRequired>true</isRequired>
-      <typePackageName>IntegrationTesting.Tests.Services</typePackageName>
-      <typePackageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</typePackageId>
-      <stereotypes />
-      <genericTypeParameters />
-    </typeReference>
-    <stereotypes />
-    <metadata />
-    <childElements />
-  </sourceEnd>
-  <targetEnd id="8bc42ad3-a792-4a6d-9eb7-db035d1f93ef" type="Query Entity Action Target End" typeId="93ef6675-cba4-4998-adff-cb22d5343ed4">
-    <name>diffIds</name>
-    <display>[query] diffIds: DiffId[*]</display>
-    <order>0</order>
-    <typeReference id="cf44caec-ea12-4287-9af5-3365706905a1">
-      <typeId>8b77b4cb-29ff-40ca-8a59-66de22b90cb3</typeId>
-      <isNavigable>true</isNavigable>
-      <isNullable>false</isNullable>
-      <isCollection>true</isCollection>
-      <isRequired>true</isRequired>
-      <typePackageName>IntegrationTesting.Tests.Domain</typePackageName>
-      <typePackageId>086ea1d7-21ff-4b2f-89af-27f09033705a</typePackageId>
-      <stereotypes />
-      <genericTypeParameters />
-    </typeReference>
-    <stereotypes />
-    <mappings>
-      <mapping type="Query Entity Mapping" typeId="25f25af9-c38b-4053-9474-b0fabe9d7ea7">
-        <source applicationId="2d1629af-eb4d-4434-b187-03ea5c1ca294" designerId="81104ae6-2bc5-4bae-b05a-f987b0372d81" elementId="ee59ecae-170d-47a4-9a1f-07eba13d6eb4" location="[IntegrationTesting.Tests].[Services].[GetDiffIdsQuery]" />
-        <target applicationId="2d1629af-eb4d-4434-b187-03ea5c1ca294" designerId="6ab29b31-27af-4f56-a67c-986d82097d63" elementId="8b77b4cb-29ff-40ca-8a59-66de22b90cb3" location="[IntegrationTesting.Tests].[Services].[DiffId]" />
-        <mappedEnds />
-      </mapping>
-    </mappings>
-    <metadata />
-    <childElements />
-  </targetEnd>
-  <associationType>Query Entity Action</associationType>
-  <associationTypeId>47ab5888-a258-4bec-a9fc-a83de69eb79d</associationTypeId>
-  <stereotypes />
-</association>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Associations/Update Entity Action/UpdateDiffIdCommand_to_diffId__3cfsp5hf.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Associations/Update Entity Action/UpdateDiffIdCommand_to_diffId__3cfsp5hf.xml
deleted file mode 100644
index dfdf15ce32..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Associations/Update Entity Action/UpdateDiffIdCommand_to_diffId__3cfsp5hf.xml	
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<association id="98d6bf30-8346-4a1b-8d09-b203b0cddf6d">
-  <sourceEnd id="354a5d4d-35e3-440b-848a-cfcd69f460ef" type="Update Entity Action Source End" typeId="6bc95978-6def-4d0c-a4f5-25bdeda8a9f6">
-    <display>updated by : DiffIds.UpdateDiffIdCommand</display>
-    <order>0</order>
-    <typeReference id="0d8cf2e0-48ce-4fb0-bd70-e01cbff7f025">
-      <typeId>9c2c2065-397d-4992-9dd0-f69c9096d5b1</typeId>
-      <isNavigable>true</isNavigable>
-      <isNullable>false</isNullable>
-      <isCollection>false</isCollection>
-      <isRequired>true</isRequired>
-      <typePackageName>IntegrationTesting.Tests.Services</typePackageName>
-      <typePackageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</typePackageId>
-      <stereotypes />
-      <genericTypeParameters />
-    </typeReference>
-    <stereotypes />
-    <metadata />
-    <childElements />
-  </sourceEnd>
-  <targetEnd id="98d6bf30-8346-4a1b-8d09-b203b0cddf6d" type="Update Entity Action Target End" typeId="516069f6-09cc-4de8-8e31-3c71ca823452">
-    <name>diffId</name>
-    <display>[update] diffId: DiffId</display>
-    <order>2</order>
-    <typeReference id="6d4e2354-c2ef-48e9-b455-662caab9da4d">
-      <typeId>8b77b4cb-29ff-40ca-8a59-66de22b90cb3</typeId>
-      <isNavigable>true</isNavigable>
-      <isNullable>false</isNullable>
-      <isCollection>false</isCollection>
-      <isRequired>true</isRequired>
-      <typePackageName>IntegrationTesting.Tests.Domain</typePackageName>
-      <typePackageId>086ea1d7-21ff-4b2f-89af-27f09033705a</typePackageId>
-      <stereotypes />
-      <genericTypeParameters />
-    </typeReference>
-    <stereotypes />
-    <mappings>
-      <mapping type="Query Entity Mapping" typeId="25f25af9-c38b-4053-9474-b0fabe9d7ea7">
-        <source applicationId="2d1629af-eb4d-4434-b187-03ea5c1ca294" designerId="81104ae6-2bc5-4bae-b05a-f987b0372d81" elementId="9c2c2065-397d-4992-9dd0-f69c9096d5b1" location="[IntegrationTesting.Tests].[Services].[UpdateDiffIdCommand]" />
-        <target applicationId="2d1629af-eb4d-4434-b187-03ea5c1ca294" designerId="6ab29b31-27af-4f56-a67c-986d82097d63" elementId="8b77b4cb-29ff-40ca-8a59-66de22b90cb3" location="[IntegrationTesting.Tests].[Services].[DiffId]" />
-        <mappedEnds>
-          <mappedEnd>
-            <expression>{MyId}</expression>
-            <path>
-              <target id="8b77b4cb-29ff-40ca-8a59-66de22b90cb3" name="DiffId" type="element" specialization="Class" />
-              <target id="d2d0ba63-cd81-47ce-8421-3562b20df1ce" name="Id" type="element" specialization="Attribute" />
-            </path>
-            <sources>
-              <source identifier="MyId" mappingType="Filter Mapping" mappingTypeId="01d09a7f-0e7c-4670-b7bc-395d7e893ef2">
-                <path>
-                  <target id="9c2c2065-397d-4992-9dd0-f69c9096d5b1" name="UpdateDiffIdCommand" type="element" specialization="Command" />
-                  <target id="13eac5bd-b4e2-41c2-916e-21c01d50d5da" name="MyId" type="element" specialization="DTO-Field" />
-                </path>
-              </source>
-            </sources>
-          </mappedEnd>
-        </mappedEnds>
-      </mapping>
-      <mapping type="Update Entity Mapping" typeId="01721b1a-a85d-4320-a5cd-8bd39247196a">
-        <source applicationId="2d1629af-eb4d-4434-b187-03ea5c1ca294" designerId="81104ae6-2bc5-4bae-b05a-f987b0372d81" elementId="9c2c2065-397d-4992-9dd0-f69c9096d5b1" location="[IntegrationTesting.Tests].[Services].[UpdateDiffIdCommand]" />
-        <target applicationId="2d1629af-eb4d-4434-b187-03ea5c1ca294" designerId="6ab29b31-27af-4f56-a67c-986d82097d63" elementId="8b77b4cb-29ff-40ca-8a59-66de22b90cb3" location="[IntegrationTesting.Tests].[Services].[DiffId]" />
-        <mappedEnds>
-          <mappedEnd>
-            <expression>{Name}</expression>
-            <path>
-              <target id="8b77b4cb-29ff-40ca-8a59-66de22b90cb3" name="DiffId" type="element" specialization="Class" />
-              <target id="b5d8624f-5cad-4ea9-9d66-020546b67e89" name="Name" type="element" specialization="Attribute" />
-            </path>
-            <sources>
-              <source identifier="Name" mappingType="Data Mapping" mappingTypeId="ca88649b-f20b-44db-a9c0-017c26155ba8">
-                <path>
-                  <target id="9c2c2065-397d-4992-9dd0-f69c9096d5b1" name="UpdateDiffIdCommand" type="element" specialization="Command" />
-                  <target id="19a08203-0e45-4d4a-8992-4d275d4bceec" name="Name" type="element" specialization="DTO-Field" />
-                </path>
-              </source>
-            </sources>
-          </mappedEnd>
-        </mappedEnds>
-      </mapping>
-    </mappings>
-    <metadata />
-    <childElements />
-  </targetEnd>
-  <associationType>Update Entity Action</associationType>
-  <associationTypeId>9ea0382a-4617-412a-a8c8-af987bbce226</associationTypeId>
-  <stereotypes />
-</association>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/AssociationVisuals/362c1bd3-ddbd-44a1-aa26-07604cc9d816.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/AssociationVisuals/362c1bd3-ddbd-44a1-aa26-07604cc9d816.xml
deleted file mode 100644
index 84ee98ecc2..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/AssociationVisuals/362c1bd3-ddbd-44a1-aa26-07604cc9d816.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<associationVisual id="362c1bd3-ddbd-44a1-aa26-07604cc9d816" zIndex="9">
-  <sourceId>efc5dbf3-b7e7-4e08-a0cb-5c2caaa4da78</sourceId>
-  <targetId>8b77b4cb-29ff-40ca-8a59-66de22b90cb3</targetId>
-  <targetPrefPoint x="660" y="385" />
-  <fixedPoints />
-</associationVisual>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/AssociationVisuals/76b5b26d-f941-43d5-9eed-680a8bd8f882.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/AssociationVisuals/76b5b26d-f941-43d5-9eed-680a8bd8f882.xml
deleted file mode 100644
index cd1183fda4..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/AssociationVisuals/76b5b26d-f941-43d5-9eed-680a8bd8f882.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<associationVisual id="76b5b26d-f941-43d5-9eed-680a8bd8f882" zIndex="6">
-  <sourceId>cc51fd39-3d3e-4344-8c01-9d8afa3c1d29</sourceId>
-  <targetId>8b77b4cb-29ff-40ca-8a59-66de22b90cb3</targetId>
-  <targetPrefPoint x="660" y="385" />
-  <fixedPoints />
-</associationVisual>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/AssociationVisuals/7d2e2256-b662-4fa2-b3a9-5e214e5c79ce.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/AssociationVisuals/7d2e2256-b662-4fa2-b3a9-5e214e5c79ce.xml
deleted file mode 100644
index 21afa0879d..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/AssociationVisuals/7d2e2256-b662-4fa2-b3a9-5e214e5c79ce.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<associationVisual id="7d2e2256-b662-4fa2-b3a9-5e214e5c79ce" zIndex="7">
-  <sourceId>e0d56959-e8ab-400e-bdda-797c71fb53ee</sourceId>
-  <targetId>8b77b4cb-29ff-40ca-8a59-66de22b90cb3</targetId>
-  <targetPrefPoint x="660" y="385" />
-  <fixedPoints />
-</associationVisual>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/AssociationVisuals/8bc42ad3-a792-4a6d-9eb7-db035d1f93ef.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/AssociationVisuals/8bc42ad3-a792-4a6d-9eb7-db035d1f93ef.xml
deleted file mode 100644
index 916f63f0d8..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/AssociationVisuals/8bc42ad3-a792-4a6d-9eb7-db035d1f93ef.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<associationVisual id="8bc42ad3-a792-4a6d-9eb7-db035d1f93ef" zIndex="10">
-  <sourceId>ee59ecae-170d-47a4-9a1f-07eba13d6eb4</sourceId>
-  <targetId>8b77b4cb-29ff-40ca-8a59-66de22b90cb3</targetId>
-  <targetPrefPoint x="660" y="385" />
-  <fixedPoints />
-</associationVisual>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/AssociationVisuals/98d6bf30-8346-4a1b-8d09-b203b0cddf6d.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/AssociationVisuals/98d6bf30-8346-4a1b-8d09-b203b0cddf6d.xml
deleted file mode 100644
index 2a13fd3c96..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/AssociationVisuals/98d6bf30-8346-4a1b-8d09-b203b0cddf6d.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<associationVisual id="98d6bf30-8346-4a1b-8d09-b203b0cddf6d" zIndex="8">
-  <sourceId>9c2c2065-397d-4992-9dd0-f69c9096d5b1</sourceId>
-  <targetId>8b77b4cb-29ff-40ca-8a59-66de22b90cb3</targetId>
-  <targetPrefPoint x="660" y="385" />
-  <fixedPoints />
-</associationVisual>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/ClassVisuals/8b77b4cb-29ff-40ca-8a59-66de22b90cb3.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/ClassVisuals/8b77b4cb-29ff-40ca-8a59-66de22b90cb3.xml
deleted file mode 100644
index a9edbb3e92..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/ClassVisuals/8b77b4cb-29ff-40ca-8a59-66de22b90cb3.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<classVisual id="8b77b4cb-29ff-40ca-8a59-66de22b90cb3" zIndex="5">
-  <position x="560" y="350" />
-  <size width="200" height="70" />
-  <autoResizeEnabled>true</autoResizeEnabled>
-</classVisual>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/ClassVisuals/9c2c2065-397d-4992-9dd0-f69c9096d5b1.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/ClassVisuals/9c2c2065-397d-4992-9dd0-f69c9096d5b1.xml
deleted file mode 100644
index 420137b816..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/ClassVisuals/9c2c2065-397d-4992-9dd0-f69c9096d5b1.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<classVisual id="9c2c2065-397d-4992-9dd0-f69c9096d5b1" zIndex="2">
-  <position x="260" y="350" />
-  <size width="200" height="70" />
-  <autoResizeEnabled>true</autoResizeEnabled>
-</classVisual>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/ClassVisuals/cc51fd39-3d3e-4344-8c01-9d8afa3c1d29.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/ClassVisuals/cc51fd39-3d3e-4344-8c01-9d8afa3c1d29.xml
deleted file mode 100644
index 7271588c3a..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/ClassVisuals/cc51fd39-3d3e-4344-8c01-9d8afa3c1d29.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<classVisual id="cc51fd39-3d3e-4344-8c01-9d8afa3c1d29" zIndex="0">
-  <position x="260" y="110" />
-  <size width="200" height="70" />
-  <autoResizeEnabled>true</autoResizeEnabled>
-</classVisual>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/ClassVisuals/e0d56959-e8ab-400e-bdda-797c71fb53ee.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/ClassVisuals/e0d56959-e8ab-400e-bdda-797c71fb53ee.xml
deleted file mode 100644
index aea1ac76bd..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/ClassVisuals/e0d56959-e8ab-400e-bdda-797c71fb53ee.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<classVisual id="e0d56959-e8ab-400e-bdda-797c71fb53ee" zIndex="1">
-  <position x="260" y="230" />
-  <size width="200" height="70" />
-  <autoResizeEnabled>true</autoResizeEnabled>
-</classVisual>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/ClassVisuals/ee59ecae-170d-47a4-9a1f-07eba13d6eb4.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/ClassVisuals/ee59ecae-170d-47a4-9a1f-07eba13d6eb4.xml
deleted file mode 100644
index f226d8b2f9..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/ClassVisuals/ee59ecae-170d-47a4-9a1f-07eba13d6eb4.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<classVisual id="ee59ecae-170d-47a4-9a1f-07eba13d6eb4" zIndex="4">
-  <position x="260" y="590" />
-  <size width="200" height="70" />
-  <autoResizeEnabled>true</autoResizeEnabled>
-</classVisual>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/ClassVisuals/efc5dbf3-b7e7-4e08-a0cb-5c2caaa4da78.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/ClassVisuals/efc5dbf3-b7e7-4e08-a0cb-5c2caaa4da78.xml
deleted file mode 100644
index 750389247a..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Diagrams/8d069b18-0546-4914-ad3d-3590c1e06f55/ClassVisuals/efc5dbf3-b7e7-4e08-a0cb-5c2caaa4da78.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<classVisual id="efc5dbf3-b7e7-4e08-a0cb-5c2caaa4da78" zIndex="3">
-  <position x="260" y="470" />
-  <size width="200" height="70" />
-  <autoResizeEnabled>true</autoResizeEnabled>
-</classVisual>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/Command/CreateDiffIdCommand__407hk78h.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/Command/CreateDiffIdCommand__407hk78h.xml
deleted file mode 100644
index 1070a84c09..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/Command/CreateDiffIdCommand__407hk78h.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<class id="cc51fd39-3d3e-4344-8c01-9d8afa3c1d29" type="Command" typeId="ccf14eb6-3a55-4d81-b5b9-d27311c70cb9">
-  <name>CreateDiffIdCommand</name>
-  <display>CreateDiffIdCommand: guid</display>
-  <isAbstract>false</isAbstract>
-  <sort-children>by-type-then-manually</sort-children>
-  <genericTypes />
-  <typeReference id="53fc16da-2384-4def-a17b-278a356d18f1">
-    <typeId>6b649125-18ea-48fd-a6ba-0bfff0d8f488</typeId>
-    <isNavigable>true</isNavigable>
-    <isNullable>false</isNullable>
-    <isCollection>false</isCollection>
-    <isRequired>true</isRequired>
-    <typePackageName>Intent.Common.Types</typePackageName>
-    <typePackageId>870ad967-cbd4-4ea9-b86d-9c3a5d55ea67</typePackageId>
-    <stereotypes />
-    <genericTypeParameters />
-  </typeReference>
-  <isMapped>false</isMapped>
-  <parentFolderId>931bc22f-a0d8-43cd-9bdc-55eb2014eca4</parentFolderId>
-  <packageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</packageId>
-  <packageName>IntegrationTesting.Tests.Services</packageName>
-  <stereotypes>
-    <stereotype stereotypeDefinitionId="b4581ed2-42ec-4ae2-83dd-dcdd5f0837b6" name="Http Settings">
-      <addedByDefault>false</addedByDefault>
-      <definitionPackageName>Intent.Metadata.WebApi</definitionPackageName>
-      <definitionPackageId>0011387a-b122-45d7-9cdb-8e21b315ab9f</definitionPackageId>
-      <properties>
-        <property name="801c3e61-4431-4d81-93fa-7e57d33cb3fa" display="Verb" value="POST" isActive="true" />
-        <property name="5dd3e07d-76eb-45d4-9956-4325fb068acc" display="Route" value="api/diff-id" isActive="true" />
-        <property name="4490e212-1e99-43ce-b3dd-048ed2a6bae8" display="Return Type Mediatype" value="application/json" isActive="true" />
-      </properties>
-    </stereotype>
-  </stereotypes>
-  <metadata>
-    <entry key="baseName" value="DiffId" />
-  </metadata>
-  <childElements>
-    <childElement id="b128dd80-8686-470b-8c4a-fdaf2312c01e" type="DTO-Field" typeId="7baed1fd-469b-4980-8fd9-4cefb8331eb2">
-      <name>Name</name>
-      <display>Name: string</display>
-      <isAbstract>false</isAbstract>
-      <genericTypes />
-      <typeReference id="b4e58c77-1bd7-4e50-8906-f13d2f8d8fe9">
-        <typeId>d384db9c-a279-45e1-801e-e4e8099625f2</typeId>
-        <isNavigable>true</isNavigable>
-        <isNullable>false</isNullable>
-        <isCollection>false</isCollection>
-        <isRequired>true</isRequired>
-        <typePackageName>Intent.Common.Types</typePackageName>
-        <typePackageId>870ad967-cbd4-4ea9-b86d-9c3a5d55ea67</typePackageId>
-        <stereotypes />
-        <genericTypeParameters />
-      </typeReference>
-      <isMapped>false</isMapped>
-      <parentFolderId>cc51fd39-3d3e-4344-8c01-9d8afa3c1d29</parentFolderId>
-      <packageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</packageId>
-      <packageName>IntegrationTesting.Tests.Services</packageName>
-      <stereotypes>
-        <stereotype stereotypeDefinitionId="4b54a612-2664-4493-a1f7-dc0623aa03da" name="Validations">
-          <addedByDefault>true</addedByDefault>
-          <definitionPackageName>Intent.Application.FluentValidation</definitionPackageName>
-          <definitionPackageId>55856e5d-8217-4c17-8fbb-082ac75baaf5</definitionPackageId>
-          <properties>
-            <property name="d144e1aa-b506-407a-b60b-716ce38b70bb" display="Not Empty" value="false" isActive="true" />
-            <property name="8d844d65-bf88-4023-85e1-4d3d7f8784cd" display="Equal" isActive="true" />
-            <property name="490e08cd-5fb4-4bfd-80cf-fda3b88f745e" display="Not Equal" isActive="true" />
-            <property name="c94dc001-4ec7-42a0-a1e0-5b75502e7bec" display="Min Length" isActive="true" />
-            <property name="cbd52384-0f1e-4f41-9e98-314231b731e1" display="Max Length" isActive="true" />
-            <property name="f9802e6b-b033-4280-ad83-e4b064943d87" display="Min" isActive="false" />
-            <property name="aca206a8-cb7e-4537-b3f5-c5c301863c14" display="Max" isActive="false" />
-            <property name="9023c463-1cce-4f11-baa5-96561697fc7f" display="Predicate" isActive="true" />
-            <property name="13d364d0-975e-47e9-ae0c-a3137326ee60" display="Predicate Message" isActive="false" />
-            <property name="85282cb5-5e12-4eb0-9568-7ccee0685e12" display="Email Address" value="false" isActive="true" />
-            <property name="e441d802-9aea-4d74-b5f9-1cd2527f3719" display="Has Custom Validation" value="false" isActive="false" />
-            <property name="e94008f2-3d5b-4157-ba72-69b3d6812617" display="Custom" value="false" isActive="true" />
-            <property name="60e7953f-29b8-4e56-a2c9-c02fae7de91e" display="Must" value="false" isActive="true" />
-            <property name="9ce77ae5-9ad5-4436-8ae0-c6c296de8492" display="CascadeMode" isActive="true" />
-          </properties>
-        </stereotype>
-      </stereotypes>
-      <metadata />
-      <childElements />
-    </childElement>
-  </childElements>
-</class>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/Command/DeleteDiffIdCommand__65kl7gkz.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/Command/DeleteDiffIdCommand__65kl7gkz.xml
deleted file mode 100644
index d36e729cbd..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/Command/DeleteDiffIdCommand__65kl7gkz.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<class id="e0d56959-e8ab-400e-bdda-797c71fb53ee" type="Command" typeId="ccf14eb6-3a55-4d81-b5b9-d27311c70cb9">
-  <name>DeleteDiffIdCommand</name>
-  <display>DeleteDiffIdCommand: void</display>
-  <isAbstract>false</isAbstract>
-  <sort-children>by-type-then-manually</sort-children>
-  <genericTypes />
-  <typeReference id="14f708ec-b274-4d71-a364-34fe6d9cd43c">
-    <isNavigable>true</isNavigable>
-    <isNullable>false</isNullable>
-    <isCollection>false</isCollection>
-    <isRequired>true</isRequired>
-    <stereotypes />
-    <genericTypeParameters />
-  </typeReference>
-  <isMapped>false</isMapped>
-  <parentFolderId>931bc22f-a0d8-43cd-9bdc-55eb2014eca4</parentFolderId>
-  <packageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</packageId>
-  <packageName>IntegrationTesting.Tests.Services</packageName>
-  <stereotypes>
-    <stereotype stereotypeDefinitionId="b4581ed2-42ec-4ae2-83dd-dcdd5f0837b6" name="Http Settings">
-      <addedByDefault>false</addedByDefault>
-      <definitionPackageName>Intent.Metadata.WebApi</definitionPackageName>
-      <definitionPackageId>0011387a-b122-45d7-9cdb-8e21b315ab9f</definitionPackageId>
-      <properties>
-        <property name="801c3e61-4431-4d81-93fa-7e57d33cb3fa" display="Verb" value="DELETE" isActive="true" />
-        <property name="5dd3e07d-76eb-45d4-9956-4325fb068acc" display="Route" value="api/diff-id/{myId}" isActive="true" />
-        <property name="4490e212-1e99-43ce-b3dd-048ed2a6bae8" display="Return Type Mediatype" value="Default" isActive="true" />
-      </properties>
-    </stereotype>
-  </stereotypes>
-  <metadata>
-    <entry key="baseName" value="DiffId" />
-  </metadata>
-  <childElements>
-    <childElement id="506d8cac-bdee-43bf-bd46-1303acd57f0e" type="DTO-Field" typeId="7baed1fd-469b-4980-8fd9-4cefb8331eb2">
-      <name>MyId</name>
-      <display>MyId: guid</display>
-      <isAbstract>false</isAbstract>
-      <genericTypes />
-      <typeReference id="3126ef1f-7d35-4d5e-ad15-020d1a0909ff">
-        <typeId>6b649125-18ea-48fd-a6ba-0bfff0d8f488</typeId>
-        <isNavigable>true</isNavigable>
-        <isNullable>false</isNullable>
-        <isCollection>false</isCollection>
-        <isRequired>true</isRequired>
-        <typePackageName>Intent.Common.Types</typePackageName>
-        <typePackageId>870ad967-cbd4-4ea9-b86d-9c3a5d55ea67</typePackageId>
-        <stereotypes />
-        <genericTypeParameters />
-      </typeReference>
-      <isMapped>false</isMapped>
-      <parentFolderId>e0d56959-e8ab-400e-bdda-797c71fb53ee</parentFolderId>
-      <packageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</packageId>
-      <packageName>IntegrationTesting.Tests.Services</packageName>
-      <stereotypes>
-        <stereotype stereotypeDefinitionId="4b54a612-2664-4493-a1f7-dc0623aa03da" name="Validations">
-          <addedByDefault>true</addedByDefault>
-          <definitionPackageName>Intent.Application.FluentValidation</definitionPackageName>
-          <definitionPackageId>55856e5d-8217-4c17-8fbb-082ac75baaf5</definitionPackageId>
-          <properties>
-            <property name="d144e1aa-b506-407a-b60b-716ce38b70bb" display="Not Empty" value="false" isActive="true" />
-            <property name="8d844d65-bf88-4023-85e1-4d3d7f8784cd" display="Equal" isActive="true" />
-            <property name="490e08cd-5fb4-4bfd-80cf-fda3b88f745e" display="Not Equal" isActive="true" />
-            <property name="c94dc001-4ec7-42a0-a1e0-5b75502e7bec" display="Min Length" isActive="false" />
-            <property name="cbd52384-0f1e-4f41-9e98-314231b731e1" display="Max Length" isActive="false" />
-            <property name="f9802e6b-b033-4280-ad83-e4b064943d87" display="Min" isActive="false" />
-            <property name="aca206a8-cb7e-4537-b3f5-c5c301863c14" display="Max" isActive="false" />
-            <property name="9023c463-1cce-4f11-baa5-96561697fc7f" display="Predicate" isActive="true" />
-            <property name="13d364d0-975e-47e9-ae0c-a3137326ee60" display="Predicate Message" isActive="false" />
-            <property name="85282cb5-5e12-4eb0-9568-7ccee0685e12" display="Email Address" value="false" isActive="false" />
-            <property name="e441d802-9aea-4d74-b5f9-1cd2527f3719" display="Has Custom Validation" value="false" isActive="false" />
-            <property name="e94008f2-3d5b-4157-ba72-69b3d6812617" display="Custom" value="false" isActive="true" />
-            <property name="60e7953f-29b8-4e56-a2c9-c02fae7de91e" display="Must" value="false" isActive="true" />
-            <property name="9ce77ae5-9ad5-4436-8ae0-c6c296de8492" display="CascadeMode" isActive="true" />
-          </properties>
-        </stereotype>
-      </stereotypes>
-      <metadata />
-      <childElements />
-    </childElement>
-  </childElements>
-</class>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/Command/UpdateDiffIdCommand__6znh01jt.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/Command/UpdateDiffIdCommand__6znh01jt.xml
deleted file mode 100644
index 4a3591c8e7..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/Command/UpdateDiffIdCommand__6znh01jt.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<class id="9c2c2065-397d-4992-9dd0-f69c9096d5b1" type="Command" typeId="ccf14eb6-3a55-4d81-b5b9-d27311c70cb9">
-  <name>UpdateDiffIdCommand</name>
-  <display>UpdateDiffIdCommand: void</display>
-  <isAbstract>false</isAbstract>
-  <sort-children>by-type-then-manually</sort-children>
-  <genericTypes />
-  <typeReference id="da9d99e8-b98d-4657-ba50-8318b398fc45">
-    <isNavigable>true</isNavigable>
-    <isNullable>false</isNullable>
-    <isCollection>false</isCollection>
-    <isRequired>true</isRequired>
-    <stereotypes />
-    <genericTypeParameters />
-  </typeReference>
-  <isMapped>false</isMapped>
-  <parentFolderId>931bc22f-a0d8-43cd-9bdc-55eb2014eca4</parentFolderId>
-  <packageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</packageId>
-  <packageName>IntegrationTesting.Tests.Services</packageName>
-  <stereotypes>
-    <stereotype stereotypeDefinitionId="b4581ed2-42ec-4ae2-83dd-dcdd5f0837b6" name="Http Settings">
-      <addedByDefault>false</addedByDefault>
-      <definitionPackageName>Intent.Metadata.WebApi</definitionPackageName>
-      <definitionPackageId>0011387a-b122-45d7-9cdb-8e21b315ab9f</definitionPackageId>
-      <properties>
-        <property name="801c3e61-4431-4d81-93fa-7e57d33cb3fa" display="Verb" value="PUT" isActive="true" />
-        <property name="5dd3e07d-76eb-45d4-9956-4325fb068acc" display="Route" value="api/diff-id/{myId}" isActive="true" />
-        <property name="4490e212-1e99-43ce-b3dd-048ed2a6bae8" display="Return Type Mediatype" value="Default" isActive="true" />
-      </properties>
-    </stereotype>
-  </stereotypes>
-  <metadata>
-    <entry key="baseName" value="DiffId" />
-  </metadata>
-  <childElements>
-    <childElement id="13eac5bd-b4e2-41c2-916e-21c01d50d5da" type="DTO-Field" typeId="7baed1fd-469b-4980-8fd9-4cefb8331eb2">
-      <name>MyId</name>
-      <display>MyId: guid</display>
-      <isAbstract>false</isAbstract>
-      <genericTypes />
-      <typeReference id="f3b06218-0283-4859-9266-fa33e626abb1">
-        <typeId>6b649125-18ea-48fd-a6ba-0bfff0d8f488</typeId>
-        <isNavigable>true</isNavigable>
-        <isNullable>false</isNullable>
-        <isCollection>false</isCollection>
-        <isRequired>true</isRequired>
-        <typePackageName>Intent.Common.Types</typePackageName>
-        <typePackageId>870ad967-cbd4-4ea9-b86d-9c3a5d55ea67</typePackageId>
-        <stereotypes />
-        <genericTypeParameters />
-      </typeReference>
-      <isMapped>false</isMapped>
-      <parentFolderId>9c2c2065-397d-4992-9dd0-f69c9096d5b1</parentFolderId>
-      <packageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</packageId>
-      <packageName>IntegrationTesting.Tests.Services</packageName>
-      <stereotypes>
-        <stereotype stereotypeDefinitionId="4b54a612-2664-4493-a1f7-dc0623aa03da" name="Validations">
-          <addedByDefault>true</addedByDefault>
-          <definitionPackageName>Intent.Application.FluentValidation</definitionPackageName>
-          <definitionPackageId>55856e5d-8217-4c17-8fbb-082ac75baaf5</definitionPackageId>
-          <properties>
-            <property name="d144e1aa-b506-407a-b60b-716ce38b70bb" display="Not Empty" value="false" isActive="true" />
-            <property name="8d844d65-bf88-4023-85e1-4d3d7f8784cd" display="Equal" isActive="true" />
-            <property name="490e08cd-5fb4-4bfd-80cf-fda3b88f745e" display="Not Equal" isActive="true" />
-            <property name="c94dc001-4ec7-42a0-a1e0-5b75502e7bec" display="Min Length" isActive="false" />
-            <property name="cbd52384-0f1e-4f41-9e98-314231b731e1" display="Max Length" isActive="false" />
-            <property name="f9802e6b-b033-4280-ad83-e4b064943d87" display="Min" isActive="false" />
-            <property name="aca206a8-cb7e-4537-b3f5-c5c301863c14" display="Max" isActive="false" />
-            <property name="9023c463-1cce-4f11-baa5-96561697fc7f" display="Predicate" isActive="true" />
-            <property name="13d364d0-975e-47e9-ae0c-a3137326ee60" display="Predicate Message" isActive="false" />
-            <property name="85282cb5-5e12-4eb0-9568-7ccee0685e12" display="Email Address" value="false" isActive="false" />
-            <property name="e441d802-9aea-4d74-b5f9-1cd2527f3719" display="Has Custom Validation" value="false" isActive="false" />
-            <property name="e94008f2-3d5b-4157-ba72-69b3d6812617" display="Custom" value="false" isActive="true" />
-            <property name="60e7953f-29b8-4e56-a2c9-c02fae7de91e" display="Must" value="false" isActive="true" />
-            <property name="9ce77ae5-9ad5-4436-8ae0-c6c296de8492" display="CascadeMode" isActive="true" />
-          </properties>
-        </stereotype>
-      </stereotypes>
-      <metadata />
-      <childElements />
-    </childElement>
-    <childElement id="19a08203-0e45-4d4a-8992-4d275d4bceec" type="DTO-Field" typeId="7baed1fd-469b-4980-8fd9-4cefb8331eb2">
-      <name>Name</name>
-      <display>Name: string</display>
-      <isAbstract>false</isAbstract>
-      <genericTypes />
-      <typeReference id="2ada375b-af27-41dd-8612-a9025461bffc">
-        <typeId>d384db9c-a279-45e1-801e-e4e8099625f2</typeId>
-        <isNavigable>true</isNavigable>
-        <isNullable>false</isNullable>
-        <isCollection>false</isCollection>
-        <isRequired>true</isRequired>
-        <typePackageName>Intent.Common.Types</typePackageName>
-        <typePackageId>870ad967-cbd4-4ea9-b86d-9c3a5d55ea67</typePackageId>
-        <stereotypes />
-        <genericTypeParameters />
-      </typeReference>
-      <isMapped>false</isMapped>
-      <parentFolderId>9c2c2065-397d-4992-9dd0-f69c9096d5b1</parentFolderId>
-      <packageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</packageId>
-      <packageName>IntegrationTesting.Tests.Services</packageName>
-      <stereotypes>
-        <stereotype stereotypeDefinitionId="4b54a612-2664-4493-a1f7-dc0623aa03da" name="Validations">
-          <addedByDefault>true</addedByDefault>
-          <definitionPackageName>Intent.Application.FluentValidation</definitionPackageName>
-          <definitionPackageId>55856e5d-8217-4c17-8fbb-082ac75baaf5</definitionPackageId>
-          <properties>
-            <property name="d144e1aa-b506-407a-b60b-716ce38b70bb" display="Not Empty" value="false" isActive="true" />
-            <property name="8d844d65-bf88-4023-85e1-4d3d7f8784cd" display="Equal" isActive="true" />
-            <property name="490e08cd-5fb4-4bfd-80cf-fda3b88f745e" display="Not Equal" isActive="true" />
-            <property name="c94dc001-4ec7-42a0-a1e0-5b75502e7bec" display="Min Length" isActive="true" />
-            <property name="cbd52384-0f1e-4f41-9e98-314231b731e1" display="Max Length" isActive="true" />
-            <property name="f9802e6b-b033-4280-ad83-e4b064943d87" display="Min" isActive="false" />
-            <property name="aca206a8-cb7e-4537-b3f5-c5c301863c14" display="Max" isActive="false" />
-            <property name="9023c463-1cce-4f11-baa5-96561697fc7f" display="Predicate" isActive="true" />
-            <property name="13d364d0-975e-47e9-ae0c-a3137326ee60" display="Predicate Message" isActive="false" />
-            <property name="85282cb5-5e12-4eb0-9568-7ccee0685e12" display="Email Address" value="false" isActive="true" />
-            <property name="e441d802-9aea-4d74-b5f9-1cd2527f3719" display="Has Custom Validation" value="false" isActive="false" />
-            <property name="e94008f2-3d5b-4157-ba72-69b3d6812617" display="Custom" value="false" isActive="true" />
-            <property name="60e7953f-29b8-4e56-a2c9-c02fae7de91e" display="Must" value="false" isActive="true" />
-            <property name="9ce77ae5-9ad5-4436-8ae0-c6c296de8492" display="CascadeMode" isActive="true" />
-          </properties>
-        </stereotype>
-      </stereotypes>
-      <metadata />
-      <childElements />
-    </childElement>
-  </childElements>
-</class>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/DTO/DiffIdDto__4jf08w5h.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/DTO/DiffIdDto__4jf08w5h.xml
deleted file mode 100644
index ffdc879842..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/DTO/DiffIdDto__4jf08w5h.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<class id="73578a41-93f0-4ddb-b552-a7a035929378" type="DTO" typeId="fee0edca-4aa0-4f77-a524-6bbd84e78734">
-  <name>DiffIdDto</name>
-  <display>DiffIdDto</display>
-  <isAbstract>false</isAbstract>
-  <sort-children>by-type-then-manually</sort-children>
-  <genericTypes />
-  <isMapped>true</isMapped>
-  <mappedClass isRoot="true">
-    <applicationId>2d1629af-eb4d-4434-b187-03ea5c1ca294</applicationId>
-    <metadataId>6ab29b31-27af-4f56-a67c-986d82097d63</metadataId>
-    <mappingSettingsId>1f747d14-681c-4a20-8c68-34223f41b825</mappingSettingsId>
-    <autoSyncTypeReference>true</autoSyncTypeReference>
-    <mappedPath>
-      <target id="8b77b4cb-29ff-40ca-8a59-66de22b90cb3" name="DiffId" type="element" specialization="Class" />
-    </mappedPath>
-  </mappedClass>
-  <parentFolderId>931bc22f-a0d8-43cd-9bdc-55eb2014eca4</parentFolderId>
-  <packageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</packageId>
-  <packageName>IntegrationTesting.Tests.Services</packageName>
-  <stereotypes />
-  <metadata>
-    <entry key="baseName" value="DiffId" />
-  </metadata>
-  <childElements>
-    <childElement id="7157b873-03b2-41c4-ba92-ab4f78f48d90" type="DTO-Field" typeId="7baed1fd-469b-4980-8fd9-4cefb8331eb2">
-      <name>Id</name>
-      <display>Id: guid</display>
-      <isAbstract>false</isAbstract>
-      <genericTypes />
-      <typeReference id="a8dc4e74-d9b1-4455-976e-ac1969f80dc8">
-        <typeId>6b649125-18ea-48fd-a6ba-0bfff0d8f488</typeId>
-        <isNavigable>true</isNavigable>
-        <isNullable>false</isNullable>
-        <isCollection>false</isCollection>
-        <isRequired>true</isRequired>
-        <typePackageName>Intent.Common.Types</typePackageName>
-        <typePackageId>870ad967-cbd4-4ea9-b86d-9c3a5d55ea67</typePackageId>
-        <stereotypes />
-        <genericTypeParameters />
-      </typeReference>
-      <isMapped>true</isMapped>
-      <mappedClass>
-        <mappingSettingsId>1f747d14-681c-4a20-8c68-34223f41b825</mappingSettingsId>
-        <autoSyncTypeReference>true</autoSyncTypeReference>
-        <mappedPath>
-          <target id="d2d0ba63-cd81-47ce-8421-3562b20df1ce" name="Id" type="element" specialization="Attribute" />
-        </mappedPath>
-      </mappedClass>
-      <parentFolderId>73578a41-93f0-4ddb-b552-a7a035929378</parentFolderId>
-      <packageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</packageId>
-      <packageName>IntegrationTesting.Tests.Services</packageName>
-      <stereotypes>
-        <stereotype stereotypeDefinitionId="4b54a612-2664-4493-a1f7-dc0623aa03da" name="Validations">
-          <addedByDefault>true</addedByDefault>
-          <definitionPackageName>Intent.Application.FluentValidation</definitionPackageName>
-          <definitionPackageId>55856e5d-8217-4c17-8fbb-082ac75baaf5</definitionPackageId>
-          <properties>
-            <property name="d144e1aa-b506-407a-b60b-716ce38b70bb" display="Not Empty" value="false" isActive="true" />
-            <property name="8d844d65-bf88-4023-85e1-4d3d7f8784cd" display="Equal" isActive="true" />
-            <property name="490e08cd-5fb4-4bfd-80cf-fda3b88f745e" display="Not Equal" isActive="true" />
-            <property name="c94dc001-4ec7-42a0-a1e0-5b75502e7bec" display="Min Length" isActive="false" />
-            <property name="cbd52384-0f1e-4f41-9e98-314231b731e1" display="Max Length" isActive="false" />
-            <property name="f9802e6b-b033-4280-ad83-e4b064943d87" display="Min" isActive="false" />
-            <property name="aca206a8-cb7e-4537-b3f5-c5c301863c14" display="Max" isActive="false" />
-            <property name="9023c463-1cce-4f11-baa5-96561697fc7f" display="Predicate" isActive="true" />
-            <property name="13d364d0-975e-47e9-ae0c-a3137326ee60" display="Predicate Message" isActive="false" />
-            <property name="85282cb5-5e12-4eb0-9568-7ccee0685e12" display="Email Address" value="false" isActive="false" />
-            <property name="e441d802-9aea-4d74-b5f9-1cd2527f3719" display="Has Custom Validation" value="false" isActive="false" />
-            <property name="e94008f2-3d5b-4157-ba72-69b3d6812617" display="Custom" value="false" isActive="true" />
-            <property name="60e7953f-29b8-4e56-a2c9-c02fae7de91e" display="Must" value="false" isActive="true" />
-            <property name="9ce77ae5-9ad5-4436-8ae0-c6c296de8492" display="CascadeMode" isActive="true" />
-          </properties>
-        </stereotype>
-      </stereotypes>
-      <metadata />
-      <childElements />
-    </childElement>
-    <childElement id="a07220ee-3355-41d7-8a8e-b5627c59e732" type="DTO-Field" typeId="7baed1fd-469b-4980-8fd9-4cefb8331eb2">
-      <name>Name</name>
-      <display>Name: string</display>
-      <isAbstract>false</isAbstract>
-      <genericTypes />
-      <typeReference id="9597abc0-d318-40dc-b159-3c3b6fc06f7b">
-        <typeId>d384db9c-a279-45e1-801e-e4e8099625f2</typeId>
-        <isNavigable>true</isNavigable>
-        <isNullable>false</isNullable>
-        <isCollection>false</isCollection>
-        <isRequired>true</isRequired>
-        <typePackageName>Intent.Common.Types</typePackageName>
-        <typePackageId>870ad967-cbd4-4ea9-b86d-9c3a5d55ea67</typePackageId>
-        <stereotypes />
-        <genericTypeParameters />
-      </typeReference>
-      <isMapped>true</isMapped>
-      <mappedClass>
-        <mappingSettingsId>1f747d14-681c-4a20-8c68-34223f41b825</mappingSettingsId>
-        <autoSyncTypeReference>true</autoSyncTypeReference>
-        <mappedPath>
-          <target id="b5d8624f-5cad-4ea9-9d66-020546b67e89" name="Name" type="element" specialization="Attribute" />
-        </mappedPath>
-      </mappedClass>
-      <parentFolderId>73578a41-93f0-4ddb-b552-a7a035929378</parentFolderId>
-      <packageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</packageId>
-      <packageName>IntegrationTesting.Tests.Services</packageName>
-      <stereotypes>
-        <stereotype stereotypeDefinitionId="4b54a612-2664-4493-a1f7-dc0623aa03da" name="Validations">
-          <addedByDefault>true</addedByDefault>
-          <definitionPackageName>Intent.Application.FluentValidation</definitionPackageName>
-          <definitionPackageId>55856e5d-8217-4c17-8fbb-082ac75baaf5</definitionPackageId>
-          <properties>
-            <property name="d144e1aa-b506-407a-b60b-716ce38b70bb" display="Not Empty" value="false" isActive="true" />
-            <property name="8d844d65-bf88-4023-85e1-4d3d7f8784cd" display="Equal" isActive="true" />
-            <property name="490e08cd-5fb4-4bfd-80cf-fda3b88f745e" display="Not Equal" isActive="true" />
-            <property name="c94dc001-4ec7-42a0-a1e0-5b75502e7bec" display="Min Length" isActive="true" />
-            <property name="cbd52384-0f1e-4f41-9e98-314231b731e1" display="Max Length" isActive="true" />
-            <property name="f9802e6b-b033-4280-ad83-e4b064943d87" display="Min" isActive="false" />
-            <property name="aca206a8-cb7e-4537-b3f5-c5c301863c14" display="Max" isActive="false" />
-            <property name="9023c463-1cce-4f11-baa5-96561697fc7f" display="Predicate" isActive="true" />
-            <property name="13d364d0-975e-47e9-ae0c-a3137326ee60" display="Predicate Message" isActive="false" />
-            <property name="85282cb5-5e12-4eb0-9568-7ccee0685e12" display="Email Address" value="false" isActive="true" />
-            <property name="e441d802-9aea-4d74-b5f9-1cd2527f3719" display="Has Custom Validation" value="false" isActive="false" />
-            <property name="e94008f2-3d5b-4157-ba72-69b3d6812617" display="Custom" value="false" isActive="true" />
-            <property name="60e7953f-29b8-4e56-a2c9-c02fae7de91e" display="Must" value="false" isActive="true" />
-            <property name="9ce77ae5-9ad5-4436-8ae0-c6c296de8492" display="CascadeMode" isActive="true" />
-          </properties>
-        </stereotype>
-      </stereotypes>
-      <metadata />
-      <childElements />
-    </childElement>
-  </childElements>
-</class>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/Diagram/DiffIds__1pq76r1k.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/Diagram/DiffIds__1pq76r1k.xml
deleted file mode 100644
index b92cba170d..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/Diagram/DiffIds__1pq76r1k.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<class id="8d069b18-0546-4914-ad3d-3590c1e06f55" type="Diagram" typeId="8c90aca5-86f4-47f1-bd58-116fe79f5c55">
-  <name>DiffIds</name>
-  <display>DiffIds</display>
-  <isAbstract>false</isAbstract>
-  <genericTypes />
-  <isMapped>false</isMapped>
-  <parentFolderId>931bc22f-a0d8-43cd-9bdc-55eb2014eca4</parentFolderId>
-  <packageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</packageId>
-  <packageName>IntegrationTesting.Tests.Services</packageName>
-  <diagram>
-    <targetPackageId>931bc22f-a0d8-43cd-9bdc-55eb2014eca4</targetPackageId>
-  </diagram>
-  <stereotypes />
-  <metadata />
-  <childElements />
-</class>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/Query/GetDiffIdByIdQuery__jvgd912f.xml b/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/Query/GetDiffIdByIdQuery__jvgd912f.xml
deleted file mode 100644
index b0f47f5653..0000000000
--- a/Tests/IntegrationTesting.Tests/Intent.Metadata/Services/IntegrationTesting.Tests.Services/Elements/Query/GetDiffIdByIdQuery__jvgd912f.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<class id="efc5dbf3-b7e7-4e08-a0cb-5c2caaa4da78" type="Query" typeId="e71b0662-e29d-4db2-868b-8a12464b25d0">
-  <name>GetDiffIdByIdQuery</name>
-  <display>GetDiffIdByIdQuery: DiffIdDto</display>
-  <isAbstract>false</isAbstract>
-  <sort-children>by-type-then-manually</sort-children>
-  <genericTypes />
-  <typeReference id="d72d867a-b4b9-43c9-a601-e0f777bda414">
-    <typeId>73578a41-93f0-4ddb-b552-a7a035929378</typeId>
-    <isNavigable>true</isNavigable>
-    <isNullable>false</isNullable>
-    <isCollection>false</isCollection>
-    <isRequired>true</isRequired>
-    <typePackageName>IntegrationTesting.Tests.Services</typePackageName>
-    <typePackageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</typePackageId>
-    <stereotypes />
-    <genericTypeParameters />
-  </typeReference>
-  <isMapped>false</isMapped>
-  <parentFolderId>931bc22f-a0d8-43cd-9bdc-55eb2014eca4</parentFolderId>
-  <packageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</packageId>
-  <packageName>IntegrationTesting.Tests.Services</packageName>
-  <stereotypes>
-    <stereotype stereotypeDefinitionId="b4581ed2-42ec-4ae2-83dd-dcdd5f0837b6" name="Http Settings">
-      <addedByDefault>false</addedByDefault>
-      <definitionPackageName>Intent.Metadata.WebApi</definitionPackageName>
-      <definitionPackageId>0011387a-b122-45d7-9cdb-8e21b315ab9f</definitionPackageId>
-      <properties>
-        <property name="801c3e61-4431-4d81-93fa-7e57d33cb3fa" display="Verb" value="GET" isActive="true" />
-        <property name="5dd3e07d-76eb-45d4-9956-4325fb068acc" display="Route" value="api/diff-id/{id}" isActive="true" />
-        <property name="4490e212-1e99-43ce-b3dd-048ed2a6bae8" display="Return Type Mediatype" value="Default" isActive="true" />
-      </properties>
-    </stereotype>
-  </stereotypes>
-  <metadata>
-    <entry key="baseName" value="DiffId" />
-  </metadata>
-  <childElements>
-    <childElement id="8cf74582-d2be-4ad2-b011-b32043963a8c" type="DTO-Field" typeId="7baed1fd-469b-4980-8fd9-4cefb8331eb2">
-      <name>Id</name>
-      <display>Id: guid</display>
-      <isAbstract>false</isAbstract>
-      <genericTypes />
-      <typeReference id="20296675-24e0-4d26-963f-2f200dfcb6b1">
-        <typeId>6b649125-18ea-48fd-a6ba-0bfff0d8f488</typeId>
-        <isNavigable>true</isNavigable>
-        <isNullable>false</isNullable>
-        <isCollection>false</isCollection>
-        <isRequired>true</isRequired>
-        <typePackageName>Intent.Common.Types</typePackageName>
-        <typePackageId>870ad967-cbd4-4ea9-b86d-9c3a5d55ea67</typePackageId>
-        <stereotypes />
-        <genericTypeParameters />
-      </typeReference>
-      <isMapped>false</isMapped>
-      <parentFolderId>efc5dbf3-b7e7-4e08-a0cb-5c2caaa4da78</parentFolderId>
-      <packageId>5c38bf3d-7506-444e-8e56-e1b9b35e6643</packageId>
-      <packageName>IntegrationTesting.Tests.Services</packageName>
-      <stereotypes>
-        <stereotype stereotypeDefinitionId="4b54a612-2664-4493-a1f7-dc0623aa03da" name="Validations">
-          <addedByDefault>true</addedByDefault>
-          <definitionPackageName>Intent.Application.FluentValidation</definitionPackageName>
-          <definitionPackageId>55856e5d-8217-4c17-8fbb-082ac75baaf5</definitionPackageId>
-          <properties>
-            <property name="d144e1aa-b506-407a-b60b-716ce38b70bb" display="Not Empty" value="false" isActive="true" />
-            <property name="8d844d65-bf88-4023-85e1-4d3d7f8784cd" display="Equal" isActive="true" />
-            <property name="490e08cd-5fb4-4bfd-80cf-fda3b88f745e" display="Not Equal" isActive="true" />
-            <property name="c94dc001-4ec7-42a0-a1e0-5b75502e7bec" display="Min Length" isActive="false" />
-            <property name="cbd52384-0f1e-4f41-9e98-314231b731e1" display="Max Length" isActive="false" />
-            <property name="f9802e6b-b033-4280-ad83-e4b064943d87" display="Min" isActive="false" />
-            <property name="aca206a8-cb7e-4537-b3f5-c5c301863c14" display="Max" isActive="false" />
-            <property name="9023c463-1cce-4f11-baa5-96561697fc7f" display="Predicate" isActive="true" />
-            <property name="13d364d0-975e-47e9-ae0c-a3137326ee60" display="Predicate Message" isActive="false" />
-            <property name="85282cb5-5e12-4eb0-9568-7ccee0685e12" display="Email Address" value="false" isActive="false" />
-            <property name="e441d802-9aea-4d74-b5f9-1cd2527f3719" display="Has Custom Validation" value="false" isActive="false" />
-            <property name="e94008f2-3d5b-4157-ba72-69b3d6812617" display="Custom" value="false" isActive="true" />
-            <property name="60e7953f-29b8-4e56-a2c9-c02fae7de91e" display="Must" value="false" isActive="true" />
-            <property name="9ce77ae5-9ad5-4436-8ae0-c6c296de8492" display="CascadeMode" isActive="true" />
-          </properties>
-        </stereotype>
-      </stereotypes>
-      <metadata />
-      <childElements />
-    </childElement>
-  </childElements>
-</class>
\ No newline at end of file
diff --git a/Tests/IntegrationTesting.Tests/modules.config b/Tests/IntegrationTesting.Tests/modules.config
index 22412f99e2..b6f83b7511 100644
--- a/Tests/IntegrationTesting.Tests/modules.config
+++ b/Tests/IntegrationTesting.Tests/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.Application.ServiceImplementations" version="4.5.1" />
@@ -20,15 +20,15 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.HealthChecks" version="2.0.2-pre.1" />
   <module moduleId="Intent.AspNetCore.IntegrationTesting" version="1.0.0-pre.2" />
-  <module moduleId="Intent.AspNetCore.IntegrationTests.CRUD" version="1.0.0-pre.4" />
+  <module moduleId="Intent.AspNetCore.IntegrationTests.CRUD" version="1.0.0-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -40,12 +40,12 @@
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.4-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modelers.Types.ServiceProxies" version="5.2.2" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
diff --git a/Tests/JavaScriptProject/modules.config b/Tests/JavaScriptProject/modules.config
index dec01e9a34..709959f87c 100644
--- a/Tests/JavaScriptProject/modules.config
+++ b/Tests/JavaScriptProject/modules.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <modules>
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.ContinuousIntegration.AzurePipelines" version="1.0.2" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
diff --git a/Tests/MassTransit.AzureServiceBus/modules.config b/Tests/MassTransit.AzureServiceBus/modules.config
index 33312ca005..637ace8be3 100644
--- a/Tests/MassTransit.AzureServiceBus/modules.config
+++ b/Tests/MassTransit.AzureServiceBus/modules.config
@@ -11,7 +11,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.CRUD.Eventing" version="5.0.1" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
@@ -22,7 +22,7 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -32,22 +32,22 @@
   <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.5.0" />
   <module moduleId="Intent.Eventing.Contracts" version="5.0.3-pre.0" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.5-pre.1" />
-  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.5" />
+  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.4" />
   <module moduleId="Intent.Eventing.MassTransit.EntityFrameworkCore" version="5.1.0" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.4-pre.0" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/MassTransit.RabbitMQ/modules.config b/Tests/MassTransit.RabbitMQ/modules.config
index 33312ca005..637ace8be3 100644
--- a/Tests/MassTransit.RabbitMQ/modules.config
+++ b/Tests/MassTransit.RabbitMQ/modules.config
@@ -11,7 +11,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.CRUD.Eventing" version="5.0.1" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
@@ -22,7 +22,7 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -32,22 +32,22 @@
   <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.5.0" />
   <module moduleId="Intent.Eventing.Contracts" version="5.0.3-pre.0" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.5-pre.1" />
-  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.5" />
+  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.4" />
   <module moduleId="Intent.Eventing.MassTransit.EntityFrameworkCore" version="5.1.0" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.4-pre.0" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/MassTransit.RetryPolicy.Exponential/modules.config b/Tests/MassTransit.RetryPolicy.Exponential/modules.config
index 647e53c040..64999073ed 100644
--- a/Tests/MassTransit.RetryPolicy.Exponential/modules.config
+++ b/Tests/MassTransit.RetryPolicy.Exponential/modules.config
@@ -2,15 +2,15 @@
 <modules>
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Eventing.Contracts" version="5.0.3-pre.0" />
-  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.5" />
+  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.4" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
 </modules>
\ No newline at end of file
diff --git a/Tests/MassTransit.RetryPolicy.Immediate/modules.config b/Tests/MassTransit.RetryPolicy.Immediate/modules.config
index 647e53c040..64999073ed 100644
--- a/Tests/MassTransit.RetryPolicy.Immediate/modules.config
+++ b/Tests/MassTransit.RetryPolicy.Immediate/modules.config
@@ -2,15 +2,15 @@
 <modules>
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Eventing.Contracts" version="5.0.3-pre.0" />
-  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.5" />
+  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.4" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
 </modules>
\ No newline at end of file
diff --git a/Tests/MassTransit.RetryPolicy.Incremental/modules.config b/Tests/MassTransit.RetryPolicy.Incremental/modules.config
index 647e53c040..64999073ed 100644
--- a/Tests/MassTransit.RetryPolicy.Incremental/modules.config
+++ b/Tests/MassTransit.RetryPolicy.Incremental/modules.config
@@ -2,15 +2,15 @@
 <modules>
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Eventing.Contracts" version="5.0.3-pre.0" />
-  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.5" />
+  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.4" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
 </modules>
\ No newline at end of file
diff --git a/Tests/MassTransit.RetryPolicy.Interval/modules.config b/Tests/MassTransit.RetryPolicy.Interval/modules.config
index 647e53c040..64999073ed 100644
--- a/Tests/MassTransit.RetryPolicy.Interval/modules.config
+++ b/Tests/MassTransit.RetryPolicy.Interval/modules.config
@@ -2,15 +2,15 @@
 <modules>
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Eventing.Contracts" version="5.0.3-pre.0" />
-  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.5" />
+  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.4" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
 </modules>
\ No newline at end of file
diff --git a/Tests/MassTransitFinbuckle.Test/modules.config b/Tests/MassTransitFinbuckle.Test/modules.config
index 7d5a77b9cd..b8abf9fea5 100644
--- a/Tests/MassTransitFinbuckle.Test/modules.config
+++ b/Tests/MassTransitFinbuckle.Test/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.CRUD.Eventing" version="5.0.1" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
@@ -22,13 +22,13 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.HealthChecks" version="2.0.2-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -39,21 +39,21 @@
   <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.5.0" />
   <module moduleId="Intent.Eventing.Contracts" version="5.0.3-pre.0" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.5-pre.1" />
-  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.5" />
+  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.4" />
   <module moduleId="Intent.Eventing.MassTransit.EntityFrameworkCore" version="5.1.0" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.4-pre.0" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.Modules.AspNetCore.MultiTenancy" version="5.1.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
diff --git a/Tests/MinimalHostingModel/MinimalHostingModel.BlazorClient/MinimalHostingModel.BlazorClient.csproj b/Tests/MinimalHostingModel/MinimalHostingModel.BlazorClient/MinimalHostingModel.BlazorClient.csproj
index 5973e612ab..e54cff367d 100644
--- a/Tests/MinimalHostingModel/MinimalHostingModel.BlazorClient/MinimalHostingModel.BlazorClient.csproj
+++ b/Tests/MinimalHostingModel/MinimalHostingModel.BlazorClient/MinimalHostingModel.BlazorClient.csproj
@@ -15,7 +15,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Tests/MinimalHostingModel/modules.config b/Tests/MinimalHostingModel/modules.config
index a07b9d8e41..d16891be3a 100644
--- a/Tests/MinimalHostingModel/modules.config
+++ b/Tests/MinimalHostingModel/modules.config
@@ -13,7 +13,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.CRUD.Eventing" version="5.0.1" />
   <module moduleId="Intent.Application.MediatR.CRUD.Tests" version="1.3.4" />
@@ -22,7 +22,7 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Cors" version="3.3.11" />
   <module moduleId="Intent.AspNetCore.HealthChecks" version="2.0.2-pre.1" />
   <module moduleId="Intent.AspNetCore.Identity.AccountController.Metadata" version="1.0.0-pre.0" />
@@ -35,7 +35,7 @@
   <module moduleId="Intent.Blazor.HttpClients.Dtos.FluentValidation" version="1.0.4" />
   <module moduleId="Intent.Blazor.WebAssembly" version="1.0.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.DomainServices" version="1.1.3" />
@@ -47,7 +47,7 @@
   <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.5.0" />
   <module moduleId="Intent.Eventing.Contracts" version="5.0.3-pre.0" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.5-pre.1" />
-  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.5" />
+  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.4" />
   <module moduleId="Intent.Eventing.MassTransit.EntityFrameworkCore" version="5.1.0" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Integration.HttpClients" version="5.1.0-pre.1" />
@@ -55,17 +55,17 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.Services" version="1.0.2" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.ServiceProxies" version="5.0.2" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Types.ServiceProxies" version="5.2.2" />
   <module moduleId="Intent.Modelers.WebClient" version="4.0.1-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
diff --git a/Tests/MongoDb.TestApplication/modules.config b/Tests/MongoDb.TestApplication/modules.config
index b696a71623..430c408778 100644
--- a/Tests/MongoDb.TestApplication/modules.config
+++ b/Tests/MongoDb.TestApplication/modules.config
@@ -13,11 +13,11 @@
   <module moduleId="Intent.Application.ServiceImplementations.Conventions.CRUD" version="5.0.3" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.HealthChecks" version="2.0.2-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DocumentDB.Dtos.AutoMapper" version="1.0.0" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -26,10 +26,10 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.MongoDb" version="1.0.12" />
   <module moduleId="Intent.MongoDb.Repositories" version="1.1.1" />
diff --git a/Tests/MultipleDocumentStores/MultipleDocumentStores.Infrastructure/MultipleDocumentStores.Infrastructure.csproj b/Tests/MultipleDocumentStores/MultipleDocumentStores.Infrastructure/MultipleDocumentStores.Infrastructure.csproj
index e285d64c87..d556945e6e 100644
--- a/Tests/MultipleDocumentStores/MultipleDocumentStores.Infrastructure/MultipleDocumentStores.Infrastructure.csproj
+++ b/Tests/MultipleDocumentStores/MultipleDocumentStores.Infrastructure/MultipleDocumentStores.Infrastructure.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Dapr.Client" Version="1.9.0" />
-    <PackageReference Include="IEvangelist.Azure.CosmosRepository" Version="3.7.0" />
+    <PackageReference Include="IEvangelist.Azure.CosmosRepository" Version="8.1.2" />
     <PackageReference Include="Intent.RoslynWeaver.Attributes" Version="2.1.4" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
diff --git a/Tests/MultipleDocumentStores/MultipleDocumentStores.Infrastructure/Repositories/CosmosDBRepositoryBase.cs b/Tests/MultipleDocumentStores/MultipleDocumentStores.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
index 1f34bb902f..4fce3b82d7 100644
--- a/Tests/MultipleDocumentStores/MultipleDocumentStores.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
+++ b/Tests/MultipleDocumentStores/MultipleDocumentStores.Infrastructure/Repositories/CosmosDBRepositoryBase.cs
@@ -68,8 +68,7 @@ public void Remove(TDomain entity)
         public async Task<List<TDomain>> FindAllAsync(CancellationToken cancellationToken = default)
         {
             var documents = await _cosmosRepository.GetAsync(_ => true, cancellationToken);
-            var results = documents.Select(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -82,8 +81,7 @@ public async Task<List<TDomain>> FindAllAsync(CancellationToken cancellationToke
             try
             {
                 var document = await _cosmosRepository.GetAsync(id, partitionKey, cancellationToken: cancellationToken);
-                var entity = document.ToEntity();
-                Track(entity);
+                var entity = LoadAndTrackDocument(document);
 
                 return entity;
             }
@@ -98,8 +96,7 @@ public virtual async Task<List<TDomain>> FindAllAsync(
             CancellationToken cancellationToken = default)
         {
             var documents = await _cosmosRepository.GetAsync(AdaptFilterPredicate(filterExpression), cancellationToken);
-            var results = documents.Select(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -119,9 +116,12 @@ public virtual async Task<IPagedList<TDomain>> FindAllAsync(
             CancellationToken cancellationToken = default)
         {
             var pagedDocuments = await _cosmosRepository.PageAsync(AdaptFilterPredicate(filterExpression), pageNo, pageSize, true, cancellationToken);
-            Track(pagedDocuments.Items.Select(document => document.ToEntity()));
+            var entities = LoadAndTrackDocuments(pagedDocuments.Items).ToList();
 
-            return new CosmosPagedList<TDomain, TDocument>(pagedDocuments, pageNo, pageSize);
+            var totalCount = pagedDocuments.Total ?? 0;
+            var pageCount = pagedDocuments.TotalPages ?? 0;
+
+            return new CosmosPagedList<TDomain, TDocument>(entities, totalCount, pageCount, pageNo, pageSize);
         }
 
         public async Task<List<TDomain>> FindByIdsAsync(
@@ -131,8 +131,7 @@ public async Task<List<TDomain>> FindByIdsAsync(
             var queryDefinition = new QueryDefinition($"SELECT * from c WHERE ARRAY_CONTAINS(@ids, c.{_idFieldName})")
                 .WithParameter("@ids", ids);
             var documents = await _cosmosRepository.GetByQueryAsync(queryDefinition, cancellationToken);
-            var results = documents.Select(document => document.ToEntity()).ToList();
-            Track(results);
+            var results = LoadAndTrackDocuments(documents).ToList();
 
             return results;
         }
@@ -148,17 +147,21 @@ private static Expression<Func<TDocument, bool>> AdaptFilterPredicate(Expression
             return Expression.Lambda<Func<TDocument, bool>>(visitor.Visit(expression.Body)!, afterParameter);
         }
 
-        public void Track(IEnumerable<TDomain> items)
+        public TDomain LoadAndTrackDocument(TDocument document)
         {
-            foreach (var item in items)
-            {
-                _unitOfWork.Track(item);
-            }
+            var entity = document.ToEntity();
+
+            _unitOfWork.Track(entity);
+
+            return entity;
         }
 
-        public void Track(TDomain item)
+        public IEnumerable<TDomain> LoadAndTrackDocuments(IEnumerable<TDocument> documents)
         {
-            _unitOfWork.Track(item);
+            foreach (var document in documents)
+            {
+                yield return LoadAndTrackDocument(document);
+            }
         }
 
         private class SubstitutionExpressionVisitor : ExpressionVisitor
diff --git a/Tests/MultipleDocumentStores/MultipleDocumentStores.Infrastructure/Repositories/CosmosPagedList.cs b/Tests/MultipleDocumentStores/MultipleDocumentStores.Infrastructure/Repositories/CosmosPagedList.cs
index a2b52414ea..a3a17ae5a4 100644
--- a/Tests/MultipleDocumentStores/MultipleDocumentStores.Infrastructure/Repositories/CosmosPagedList.cs
+++ b/Tests/MultipleDocumentStores/MultipleDocumentStores.Infrastructure/Repositories/CosmosPagedList.cs
@@ -14,16 +14,16 @@ internal class CosmosPagedList<TDomain, TDocument> : List<TDomain>, IPagedList<T
         where TDomain : class
         where TDocument : ICosmosDBDocument<TDomain, TDocument>
     {
-        public CosmosPagedList(IPageQueryResult<TDocument> pagedResult, int pageNo, int pageSize)
+        public CosmosPagedList(IEnumerable<TDomain> pagedResult, int totalCount, int pageCount, int pageNo, int pageSize)
         {
-            TotalCount = pagedResult.Total ?? 0;
-            PageCount = pagedResult.TotalPages ?? 0;
+            TotalCount = totalCount;
+            PageCount = pageCount;
             PageNo = pageNo;
             PageSize = pageSize;
 
-            foreach (var result in pagedResult.Items)
+            foreach (var result in pagedResult)
             {
-                Add(result.ToEntity());
+                Add(result);
             }
         }
 
diff --git a/Tests/MultipleDocumentStores/MultipleDocumentStores.application.config b/Tests/MultipleDocumentStores/MultipleDocumentStores.application.config
index 1e35f51fa3..9dff50b98e 100644
--- a/Tests/MultipleDocumentStores/MultipleDocumentStores.application.config
+++ b/Tests/MultipleDocumentStores/MultipleDocumentStores.application.config
@@ -55,6 +55,18 @@
         </setting>
       </settings>
     </group>
+    <group id="e9f6758c-f8db-4cad-af33-827b867be548" title="CosmosDb">
+      <module>Intent.CosmosDB</module>
+      <icon type="UrlImagePath" source="data:image/png;base64,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" />
+      <settings>
+        <setting id="fcb114f7-77b4-4c6a-96c0-41bb146f4166" title="Use Optimistic Concurrency" module="Intent.CosmosDB" type="switch">
+          <hint>Ensures updates are applied only when document etags match, for improved concurrency management</hint>
+          <value>false</value>
+          <isRequired>true</isRequired>
+          <options />
+        </setting>
+      </settings>
+    </group>
     <group id="2392c046-0aa7-4ee5-a77a-e954c4a7aab5" title="CQRS Settings">
       <module>Intent.Application.MediatR</module>
       <icon type="UrlImagePath" source="data:image/png;base64,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" />
diff --git a/Tests/MultipleDocumentStores/modules.config b/Tests/MultipleDocumentStores/modules.config
index f07d908a46..0af54b1e81 100644
--- a/Tests/MultipleDocumentStores/modules.config
+++ b/Tests/MultipleDocumentStores/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.Application.ServiceImplementations" version="4.5.1" />
@@ -20,15 +20,15 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.HealthChecks" version="2.0.2-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
-  <module moduleId="Intent.CosmosDB" version="1.0.3" />
+  <module moduleId="Intent.CosmosDB" version="1.0.4-pre.0" />
   <module moduleId="Intent.Dapr.AspNetCore" version="2.0.2" />
   <module moduleId="Intent.Dapr.AspNetCore.StateManagement" version="1.2.2" />
   <module moduleId="Intent.DocumentDB.Dtos.AutoMapper" version="1.0.0" />
@@ -40,11 +40,11 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.MongoDb" version="1.0.12" />
   <module moduleId="Intent.MongoDb.Repositories" version="1.1.1" />
diff --git a/Tests/Publish.AspNetCore.GooglePubSub.TestApplication/modules.config b/Tests/Publish.AspNetCore.GooglePubSub.TestApplication/modules.config
index e04dcddbc0..a74dde5582 100644
--- a/Tests/Publish.AspNetCore.GooglePubSub.TestApplication/modules.config
+++ b/Tests/Publish.AspNetCore.GooglePubSub.TestApplication/modules.config
@@ -14,10 +14,10 @@
   <module moduleId="Intent.Application.ServiceImplementations.CRUD.Eventing" version="1.0.10" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -30,13 +30,13 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
diff --git a/Tests/Publish.AspNetCore.MassTransit.OutBoxEF.TestApplication/modules.config b/Tests/Publish.AspNetCore.MassTransit.OutBoxEF.TestApplication/modules.config
index bd2b085d94..24dded5b10 100644
--- a/Tests/Publish.AspNetCore.MassTransit.OutBoxEF.TestApplication/modules.config
+++ b/Tests/Publish.AspNetCore.MassTransit.OutBoxEF.TestApplication/modules.config
@@ -14,10 +14,10 @@
   <module moduleId="Intent.Application.ServiceImplementations.CRUD.Eventing" version="1.0.10" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -25,20 +25,20 @@
   <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.5.0" />
   <module moduleId="Intent.Eventing.Contracts" version="5.0.3-pre.0" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.5-pre.1" />
-  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.5" />
+  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.4" />
   <module moduleId="Intent.Eventing.MassTransit.EntityFrameworkCore" version="5.1.0" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.ValueObjects" version="4.1.3" />
diff --git a/Tests/Publish.AspNetCore.MassTransit.OutBoxNone.TestApplication/modules.config b/Tests/Publish.AspNetCore.MassTransit.OutBoxNone.TestApplication/modules.config
index 051346d2c8..64d6746505 100644
--- a/Tests/Publish.AspNetCore.MassTransit.OutBoxNone.TestApplication/modules.config
+++ b/Tests/Publish.AspNetCore.MassTransit.OutBoxNone.TestApplication/modules.config
@@ -14,10 +14,10 @@
   <module moduleId="Intent.Application.ServiceImplementations.CRUD.Eventing" version="1.0.10" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -25,19 +25,19 @@
   <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.5.0" />
   <module moduleId="Intent.Eventing.Contracts" version="5.0.3-pre.0" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.5-pre.1" />
-  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.5" />
+  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.4" />
   <module moduleId="Intent.Eventing.MassTransit.EntityFrameworkCore" version="5.1.0" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
diff --git a/Tests/Publish.CleanArch.GooglePubSub.TestApplication/modules.config b/Tests/Publish.CleanArch.GooglePubSub.TestApplication/modules.config
index c0390f2562..03cd26ca1b 100644
--- a/Tests/Publish.CleanArch.GooglePubSub.TestApplication/modules.config
+++ b/Tests/Publish.CleanArch.GooglePubSub.TestApplication/modules.config
@@ -11,7 +11,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.CRUD.Eventing" version="5.0.1" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
@@ -21,7 +21,7 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -37,15 +37,15 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/Publish.CleanArch.MassTransit.OutboxEF.TestApplication/modules.config b/Tests/Publish.CleanArch.MassTransit.OutboxEF.TestApplication/modules.config
index fd5cc70a76..ac6d99f53a 100644
--- a/Tests/Publish.CleanArch.MassTransit.OutboxEF.TestApplication/modules.config
+++ b/Tests/Publish.CleanArch.MassTransit.OutboxEF.TestApplication/modules.config
@@ -11,7 +11,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.CRUD.Eventing" version="5.0.1" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
@@ -21,7 +21,7 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -31,22 +31,22 @@
   <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.5.0" />
   <module moduleId="Intent.Eventing.Contracts" version="5.0.3-pre.0" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.5-pre.1" />
-  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.5" />
+  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.4" />
   <module moduleId="Intent.Eventing.MassTransit.EntityFrameworkCore" version="5.1.0" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.4-pre.0" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/Publish.CleanArch.MassTransit.OutboxNone.TestApplication/modules.config b/Tests/Publish.CleanArch.MassTransit.OutboxNone.TestApplication/modules.config
index ddfc1ba4b6..1cb7cc0632 100644
--- a/Tests/Publish.CleanArch.MassTransit.OutboxNone.TestApplication/modules.config
+++ b/Tests/Publish.CleanArch.MassTransit.OutboxNone.TestApplication/modules.config
@@ -11,7 +11,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.CRUD.Eventing" version="5.0.1" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
@@ -21,7 +21,7 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -31,7 +31,7 @@
   <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.5.0" />
   <module moduleId="Intent.Eventing.Contracts" version="5.0.3-pre.0" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.5-pre.1" />
-  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.5" />
+  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.4" />
   <module moduleId="Intent.Eventing.MassTransit.EntityFrameworkCore" version="5.1.0" />
   <module moduleId="Intent.Eventing.MassTransit.Scheduling" version="1.0.1" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
@@ -39,15 +39,15 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/Publish.CleanArchDapr.TestApplication/modules.config b/Tests/Publish.CleanArchDapr.TestApplication/modules.config
index 3075c77ae9..1621a16bf6 100644
--- a/Tests/Publish.CleanArchDapr.TestApplication/modules.config
+++ b/Tests/Publish.CleanArchDapr.TestApplication/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.CRUD.Eventing" version="5.0.1" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
@@ -22,7 +22,7 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Dapr.AspNetCore" version="2.0.2" />
   <module moduleId="Intent.Dapr.AspNetCore.Pubsub" version="2.0.3" />
@@ -42,16 +42,16 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.ServiceProxies" version="5.0.2" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Types.ServiceProxies" version="5.2.2" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
diff --git a/Tests/Redis.Om.Repositories/Intent.Metadata/Domain/Domain.designer.config b/Tests/Redis.Om.Repositories/Intent.Metadata/Domain/Domain.designer.config
index 88d828b0c2..792c93bad6 100644
--- a/Tests/Redis.Om.Repositories/Intent.Metadata/Domain/Domain.designer.config
+++ b/Tests/Redis.Om.Repositories/Intent.Metadata/Domain/Domain.designer.config
@@ -13,7 +13,6 @@
     <designerReference id="da1d4420-70d8-408b-b8d3-f1def412d14c" name="Domain Value Objects" module="Intent.Modelers.Domain.ValueObjects" />
     <designerReference id="ee1b6efd-1cc6-441c-a50e-edc50f5ac6a3" name="RDBMS Key Automation Extensions" module="Intent.Metadata.RDBMS" />
     <designerReference id="1f1dbe49-766a-44f8-bf58-6c9fd5e4e9c5" name="RDBMS Types" module="Intent.Metadata.RDBMS" />
-    <designerReference id="2c841f19-9f06-4814-abae-07d8cf4698e3" name="Redis OM Key Automation" module="Intent.Redis.Om.Repositories" />
   </designerReferences>
   <packageReferences>
     <packageReference packageId="47cbdc37-d612-4a46-aef9-100a17e980c4" include="Redis.Om.Repositories.Domain" isExternal="false">
diff --git a/Tests/Redis.Om.Repositories/modules.config b/Tests/Redis.Om.Repositories/modules.config
index 5ba807d134..a94f0921d3 100644
--- a/Tests/Redis.Om.Repositories/modules.config
+++ b/Tests/Redis.Om.Repositories/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.Application.ServiceImplementations" version="4.5.1" />
@@ -20,12 +20,12 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.HealthChecks" version="2.0.2-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DocumentDB.Dtos.AutoMapper" version="1.0.0" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
@@ -40,11 +40,11 @@
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
-  <module moduleId="Intent.Redis.Om.Repositories" version="1.0.0-pre.2" />
+  <module moduleId="Intent.Redis.Om.Repositories" version="1.0.0-pre.0" />
   <module moduleId="Intent.ValueObjects" version="4.1.3" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
 </modules>
\ No newline at end of file
diff --git a/Tests/RichDomain/modules.config b/Tests/RichDomain/modules.config
index 08c2414fbc..017c3f22e7 100644
--- a/Tests/RichDomain/modules.config
+++ b/Tests/RichDomain/modules.config
@@ -11,7 +11,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.CRUD.Tests" version="1.3.4" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
@@ -21,7 +21,7 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -35,12 +35,12 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
diff --git a/Tests/Shared Metadata/DtoSettings/Services/DtoSettings.Services.pkg.config b/Tests/Shared Metadata/DtoSettings/Services/DtoSettings.Services.pkg.config
index b640e52733..fa88ca0d23 100644
--- a/Tests/Shared Metadata/DtoSettings/Services/DtoSettings.Services.pkg.config	
+++ b/Tests/Shared Metadata/DtoSettings/Services/DtoSettings.Services.pkg.config	
@@ -30,9 +30,6 @@
     <reference packageId="4ba53041-59f9-4446-a207-6da4fbdf86fe" include="Intent.Modelers.Services" isExternal="true">
       <module>Intent.Modelers.Services</module>
     </reference>
-    <reference packageId="45fb22e9-f493-4de5-9fe0-845f783aa9d4" include="Intent.Modelers.Services.CQRS" isExternal="true">
-      <module>Intent.Modelers.Services.CQRS</module>
-    </reference>
     <reference packageId="bff48d8d-9246-4ad7-9dda-9703b7139b86" include="Intent.Modelers.Services.DomainInteractions" isExternal="true">
       <module>Intent.Modelers.Services.DomainInteractions</module>
     </reference>
diff --git a/Tests/SignalR/modules.config b/Tests/SignalR/modules.config
index dba8f23bbb..0304860512 100644
--- a/Tests/SignalR/modules.config
+++ b/Tests/SignalR/modules.config
@@ -12,20 +12,20 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.Application.ServiceImplementations" version="4.5.1" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.SignalR" version="1.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -38,12 +38,12 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/Standard.AspNetCore.ServiceCallHandlers/modules.config b/Tests/Standard.AspNetCore.ServiceCallHandlers/modules.config
index 2eb852253b..7e80277167 100644
--- a/Tests/Standard.AspNetCore.ServiceCallHandlers/modules.config
+++ b/Tests/Standard.AspNetCore.ServiceCallHandlers/modules.config
@@ -15,11 +15,11 @@
   <module moduleId="Intent.Application.ServiceImplementations.CRUD.Eventing" version="1.0.10" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -27,18 +27,18 @@
   <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.5.0" />
   <module moduleId="Intent.Eventing.Contracts" version="5.0.3-pre.0" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.5-pre.1" />
-  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.5" />
+  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.4" />
   <module moduleId="Intent.Eventing.MassTransit.EntityFrameworkCore" version="5.1.0" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.VisualStudio.Projects" version="3.6.1-pre.3" />
diff --git a/Tests/Standard.AspNetCore.TestApplication/Standard.AspNetCore.TestApplication.Infrastructure/Standard.AspNetCore.TestApplication.Infrastructure.csproj b/Tests/Standard.AspNetCore.TestApplication/Standard.AspNetCore.TestApplication.Infrastructure/Standard.AspNetCore.TestApplication.Infrastructure.csproj
index 1d4e0f0e93..5d21cb6908 100644
--- a/Tests/Standard.AspNetCore.TestApplication/Standard.AspNetCore.TestApplication.Infrastructure/Standard.AspNetCore.TestApplication.Infrastructure.csproj
+++ b/Tests/Standard.AspNetCore.TestApplication/Standard.AspNetCore.TestApplication.Infrastructure/Standard.AspNetCore.TestApplication.Infrastructure.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Tests/Standard.AspNetCore.TestApplication/modules.config b/Tests/Standard.AspNetCore.TestApplication/modules.config
index bb2598d2fb..00301f4e4f 100644
--- a/Tests/Standard.AspNetCore.TestApplication/modules.config
+++ b/Tests/Standard.AspNetCore.TestApplication/modules.config
@@ -15,12 +15,12 @@
   <module moduleId="Intent.Application.ServiceImplementations.Conventions.CRUD" version="5.0.3" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -31,12 +31,12 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.ServiceProxies" version="5.0.2" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modelers.Types.ServiceProxies" version="5.2.2" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OpenTelemetry" version="2.0.1" />
diff --git a/Tests/Subscribe.CleanArchDapr.TestApplication/Subscribe.CleanArchDapr.TestApplication.Infrastructure/Subscribe.CleanArchDapr.TestApplication.Infrastructure.csproj b/Tests/Subscribe.CleanArchDapr.TestApplication/Subscribe.CleanArchDapr.TestApplication.Infrastructure/Subscribe.CleanArchDapr.TestApplication.Infrastructure.csproj
index e84e97cb8e..0f80e13613 100644
--- a/Tests/Subscribe.CleanArchDapr.TestApplication/Subscribe.CleanArchDapr.TestApplication.Infrastructure/Subscribe.CleanArchDapr.TestApplication.Infrastructure.csproj
+++ b/Tests/Subscribe.CleanArchDapr.TestApplication/Subscribe.CleanArchDapr.TestApplication.Infrastructure/Subscribe.CleanArchDapr.TestApplication.Infrastructure.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Tests/Subscribe.CleanArchDapr.TestApplication/modules.config b/Tests/Subscribe.CleanArchDapr.TestApplication/modules.config
index 3075c77ae9..1621a16bf6 100644
--- a/Tests/Subscribe.CleanArchDapr.TestApplication/modules.config
+++ b/Tests/Subscribe.CleanArchDapr.TestApplication/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.CRUD.Eventing" version="5.0.1" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
@@ -22,7 +22,7 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Dapr.AspNetCore" version="2.0.2" />
   <module moduleId="Intent.Dapr.AspNetCore.Pubsub" version="2.0.3" />
@@ -42,16 +42,16 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.ServiceProxies" version="5.0.2" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Types.ServiceProxies" version="5.2.2" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
diff --git a/Tests/Subscribe.GooglePubSub.TestApplication/modules.config b/Tests/Subscribe.GooglePubSub.TestApplication/modules.config
index f698621291..8c5a70c65a 100644
--- a/Tests/Subscribe.GooglePubSub.TestApplication/modules.config
+++ b/Tests/Subscribe.GooglePubSub.TestApplication/modules.config
@@ -14,10 +14,10 @@
   <module moduleId="Intent.Application.ServiceImplementations.CRUD.Eventing" version="1.0.10" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DocumentDB.Dtos.AutoMapper" version="1.0.0" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -31,13 +31,13 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.MongoDb" version="1.0.12" />
   <module moduleId="Intent.MongoDb.Repositories" version="1.1.1" />
diff --git a/Tests/Subscribe.MassTransit.OutboxEF/modules.config b/Tests/Subscribe.MassTransit.OutboxEF/modules.config
index 68717400c7..00e791f07c 100644
--- a/Tests/Subscribe.MassTransit.OutboxEF/modules.config
+++ b/Tests/Subscribe.MassTransit.OutboxEF/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.CRUD.Eventing" version="5.0.1" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
@@ -20,12 +20,12 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -35,22 +35,22 @@
   <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.5.0" />
   <module moduleId="Intent.Eventing.Contracts" version="5.0.3-pre.0" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.5-pre.1" />
-  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.5" />
+  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.4" />
   <module moduleId="Intent.Eventing.MassTransit.EntityFrameworkCore" version="5.1.0" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.4-pre.0" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/Subscribe.MassTransit.OutboxMemory/modules.config b/Tests/Subscribe.MassTransit.OutboxMemory/modules.config
index 68717400c7..00e791f07c 100644
--- a/Tests/Subscribe.MassTransit.OutboxMemory/modules.config
+++ b/Tests/Subscribe.MassTransit.OutboxMemory/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.CRUD.Eventing" version="5.0.1" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
@@ -20,12 +20,12 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
   <module moduleId="Intent.Entities" version="5.0.2" />
@@ -35,22 +35,22 @@
   <module moduleId="Intent.EntityFrameworkCore.Repositories" version="4.5.0" />
   <module moduleId="Intent.Eventing.Contracts" version="5.0.3-pre.0" />
   <module moduleId="Intent.Eventing.Contracts.DomainMapping" version="4.1.5-pre.1" />
-  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.5" />
+  <module moduleId="Intent.Eventing.MassTransit" version="6.0.2-pre.4" />
   <module moduleId="Intent.Eventing.MassTransit.EntityFrameworkCore" version="5.1.0" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.MediatR.DomainEvents" version="5.0.4-pre.0" />
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
-  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Eventing" version="5.0.2-pre.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
-  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.2" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
+  <module moduleId="Intent.Modelers.Services.EventInteractions" version="1.0.2-pre.1" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/SwashbuckleSettings.All/modules.config b/Tests/SwashbuckleSettings.All/modules.config
index cb07dc009d..01dedff160 100644
--- a/Tests/SwashbuckleSettings.All/modules.config
+++ b/Tests/SwashbuckleSettings.All/modules.config
@@ -7,7 +7,7 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
diff --git a/Tests/SwashbuckleSettings.NonNullableMandatory/modules.config b/Tests/SwashbuckleSettings.NonNullableMandatory/modules.config
index cb07dc009d..01dedff160 100644
--- a/Tests/SwashbuckleSettings.NonNullableMandatory/modules.config
+++ b/Tests/SwashbuckleSettings.NonNullableMandatory/modules.config
@@ -7,7 +7,7 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
diff --git a/Tests/SwashbuckleSettings.None/modules.config b/Tests/SwashbuckleSettings.None/modules.config
index cb07dc009d..01dedff160 100644
--- a/Tests/SwashbuckleSettings.None/modules.config
+++ b/Tests/SwashbuckleSettings.None/modules.config
@@ -7,7 +7,7 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
diff --git a/Tests/SwashbuckleSettings.SimpleSchemaId/modules.config b/Tests/SwashbuckleSettings.SimpleSchemaId/modules.config
index cb07dc009d..01dedff160 100644
--- a/Tests/SwashbuckleSettings.SimpleSchemaId/modules.config
+++ b/Tests/SwashbuckleSettings.SimpleSchemaId/modules.config
@@ -7,7 +7,7 @@
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Infrastructure.DependencyInjection" version="4.1.0" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
diff --git a/Tests/TableStorage.Tests/modules.config b/Tests/TableStorage.Tests/modules.config
index 96dd9bf139..8bd30c5b9c 100644
--- a/Tests/TableStorage.Tests/modules.config
+++ b/Tests/TableStorage.Tests/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.Application.ServiceImplementations" version="4.5.1" />
@@ -20,14 +20,14 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.HealthChecks" version="2.0.2-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.AspNetCore.Versioning" version="1.1.1" />
-  <module moduleId="Intent.Azure.TableStorage" version="1.0.0-beta.13" />
+  <module moduleId="Intent.Azure.TableStorage" version="1.0.0-beta.12" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.DocumentDB.Dtos.AutoMapper" version="1.0.0" />
   <module moduleId="Intent.DomainEvents" version="5.0.2" />
@@ -41,12 +41,12 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Events" version="4.0.1" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/intent/Application.Identity.Jwt.TestApplication/modules.config b/Tests/intent/Application.Identity.Jwt.TestApplication/modules.config
index 527d16150e..49df6d943e 100644
--- a/Tests/intent/Application.Identity.Jwt.TestApplication/modules.config
+++ b/Tests/intent/Application.Identity.Jwt.TestApplication/modules.config
@@ -14,11 +14,11 @@
   <module moduleId="Intent.Application.ServiceImplementations.Conventions.CRUD" version="5.0.3" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -28,10 +28,10 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.JWT" version="4.2.0" />
diff --git a/Tests/intent/Application.Identity.MSAL.TestApplication/modules.config b/Tests/intent/Application.Identity.MSAL.TestApplication/modules.config
index d4707a1079..b4bfc03af6 100644
--- a/Tests/intent/Application.Identity.MSAL.TestApplication/modules.config
+++ b/Tests/intent/Application.Identity.MSAL.TestApplication/modules.config
@@ -14,11 +14,11 @@
   <module moduleId="Intent.Application.ServiceImplementations.Conventions.CRUD" version="5.0.3" />
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -28,10 +28,10 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
   <module moduleId="Intent.Security.MSAL" version="4.2.0" />
diff --git a/Tests/intent/GraphQL.CQRS.TestApplication/modules.config b/Tests/intent/GraphQL.CQRS.TestApplication/modules.config
index 3835cb6b8c..780929acfc 100644
--- a/Tests/intent/GraphQL.CQRS.TestApplication/modules.config
+++ b/Tests/intent/GraphQL.CQRS.TestApplication/modules.config
@@ -12,7 +12,7 @@
   <module moduleId="Intent.Application.FluentValidation.Dtos" version="3.8.0" />
   <module moduleId="Intent.Application.Identity" version="3.5.1" />
   <module moduleId="Intent.Application.MediatR" version="4.2.2" />
-  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.3" />
+  <module moduleId="Intent.Application.MediatR.Behaviours" version="4.2.10-pre.2" />
   <module moduleId="Intent.Application.MediatR.CRUD" version="6.0.3" />
   <module moduleId="Intent.Application.MediatR.FluentValidation" version="4.5.1" />
   <module moduleId="Intent.Application.ServiceImplementations" version="4.5.1" />
@@ -20,12 +20,12 @@
   <module moduleId="Intent.AspNetCore" version="6.0.1" />
   <module moduleId="Intent.AspNetCore.Controllers" version="6.0.2" />
   <module moduleId="Intent.AspNetCore.Controllers.Dispatch.MediatR" version="5.5.0" />
-  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.2" />
+  <module moduleId="Intent.AspNetCore.Controllers.Dispatch.ServiceContract" version="5.2.4-pre.1" />
   <module moduleId="Intent.AspNetCore.Cors" version="3.3.11" />
   <module moduleId="Intent.AspNetCore.Swashbuckle" version="5.0.1" />
   <module moduleId="Intent.AspNetCore.Swashbuckle.Security" version="4.0.6" />
   <module moduleId="Intent.Common" version="3.5.3-pre.1" />
-  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.3" />
+  <module moduleId="Intent.Common.CSharp" version="3.5.2-pre.1" />
   <module moduleId="Intent.Common.Types" version="3.3.9" />
   <module moduleId="Intent.Entities" version="5.0.2" />
   <module moduleId="Intent.Entities.Repositories.Api" version="5.1.0" />
@@ -39,12 +39,12 @@
   <module moduleId="Intent.Metadata.DocumentDB" version="1.1.10-pre.0" />
   <module moduleId="Intent.Metadata.RDBMS" version="3.5.12" />
   <module moduleId="Intent.Metadata.WebApi" version="4.4.2-pre.0" />
-  <module moduleId="Intent.Modelers.Domain" version="3.5.1" />
+  <module moduleId="Intent.Modelers.Domain" version="3.6.0-pre.0" />
   <module moduleId="Intent.Modelers.Domain.Repositories" version="3.3.3" />
   <module moduleId="Intent.Modelers.Domain.ValueObjects" version="3.4.1" />
   <module moduleId="Intent.Modelers.Services" version="3.5.1" />
-  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.2-pre.0" />
-  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.1" />
+  <module moduleId="Intent.Modelers.Services.CQRS" version="4.1.1" />
+  <module moduleId="Intent.Modelers.Services.DomainInteractions" version="1.0.2-pre.0" />
   <module moduleId="Intent.Modelers.Services.GraphQL" version="1.0.0" />
   <module moduleId="Intent.Modules.AspNetCore.Logging.Serilog" version="5.0.1" />
   <module moduleId="Intent.OutputManager.RoslynWeaver" version="4.5.1-pre.0" />
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c67a18c798..9c706db886 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -53,9 +53,52 @@ steps:
 - task: PowerShell@2
   displayName: 'Imodspec validation'
   inputs:
+    targetType: 'inline'
     pwsh: true
-    filePath: 'PipelineScripts/pre-build-validation.ps1'
-    arguments: '"Intent.Modules.NET"'
+    script: |
+      $hasError = $false
+
+      Get-ChildItem -Path . -Filter *.imodspec -Recurse -Depth 2 | ForEach-Object {
+          $file = $_.FullName
+          
+          [xml] $content = Get-Content $file
+          
+          $authors = $content.package.authors
+          $summary = $content.package.summary
+          $description = $content.package.description
+      
+          $reportedFileName = $false
+      
+          if ($authors -eq "Intent.Modules.NET") {
+              if ($reportedFileName -eq $false) {
+                  Write-Host "$($file)"
+                  $reportedFileName = $true
+              }
+              Write-Host "Authors not set"
+              $hasError = $true
+          }
+          if ($summary -eq "A custom module for Intent.Modules.NET.") {
+              if ($reportedFileName -eq $false) {
+                  Write-Host "$($file)"
+                  $reportedFileName = $true
+              }
+              Write-Host "Summary not set"
+              $hasError = $true
+          }
+          if ($description -eq "A custom module for Intent.Modules.NET.") {
+              if ($reportedFileName -eq $false) {
+                  Write-Host "$($file)"
+                  $reportedFileName = $true
+              }
+              Write-Host "Description not set"
+              $hasError = $true
+          }
+      }
+      
+      if ($hasError -eq $true) {
+          Write-Error "Imodspec validation failed."
+          exit 1;
+      }
 
 # Required for entry in NuGet.Config that is generated as part of 'dotnet pack'.
 - task: NuGetAuthenticate@1
@@ -67,7 +110,7 @@ steps:
     pwsh: true
     failOnStderr: true
     ignoreLASTEXITCODE: true
-    filePath: 'PipelineScripts/dotnet-pack-all.ps1'
+    filePath: 'dotnet-pack-all.ps1'
     arguments: '-dotnetPackOutputDirectory $(Build.ArtifactStagingDirectory) -vstsFeedUrl $(vstsFeedUrl)'
 
 # Push the NuGet packages to the DevOps artifact feed so that it's available to other pipelines
@@ -120,7 +163,7 @@ steps:
   inputs:
     command: 'test'
     projects: $(targetsToBuild)
-    arguments: '--no-build --filter Category!=ExcludeOnCI'
+    arguments: '--no-build'
 
 - task: PowerShell@2
   displayName: 'Install Intent CLI'
@@ -139,7 +182,7 @@ steps:
     targetType: 'inline'
     pwsh: true
     script: |
-      ./PipelineScripts/prepare-intent-testing.ps1
+      ./prepare-intent-testing.ps1
       intent-cli ensure-no-outstanding-changes "$Env:INTENT_USER" "$Env:INTENT_PASS" "$Env:INTENT_SOLUTION_PATH"
 
 - task: PowerShell@2
diff --git a/PipelineScripts/dotnet-pack-all.ps1 b/dotnet-pack-all.ps1
similarity index 100%
rename from PipelineScripts/dotnet-pack-all.ps1
rename to dotnet-pack-all.ps1
diff --git a/PipelineScripts/prepare-intent-testing.ps1 b/prepare-intent-testing.ps1
similarity index 100%
rename from PipelineScripts/prepare-intent-testing.ps1
rename to prepare-intent-testing.ps1