diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8745defd..7cbc1b9e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 Represents the **NuGet** versions.
 
+## v5.17.0
+- *Enhancement:* The `Common`-project related code-generated artefacts have all been updated to leverage `global using` and file scoped namespace declarations.
+  - A new [`GlobalUsings.cs`](./templates/Beef.Template.Solution/content/Company.AppName.Common/GlobalUsings.cs) will need to be manually added to existing `Common` projects to enable; see [this](./templates/Beef.Template.Solution/content/Company.AppName.Common/GlobalUsings.cs) for an example and alter the last two namespaces accordingly. 
+  - The `*.Common.csproj` will need to be manually updated to include `<LangVersion>Preview</LangVersion>` and `<ImplicitUsings>true</ImplicitUsings>`.
+
 ## v5.16.2
 - *Fixed:* `Operation.AuthEntity` and `Operation.AuthOperation` updated to code-gen the `Manager`-based authorization (`ExecutionContent.UserIsAuthorized`) invocation.
 - *Fixed:* Code-generation logging/auditing of endpoints updated to also include the authorization configuration.
diff --git a/Common.targets b/Common.targets
index a55ce5c00..8d377acea 100644
--- a/Common.targets
+++ b/Common.targets
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>5.16.2</Version>
+		<Version>5.17.0</Version>
 		<LangVersion>preview</LangVersion>
 		<Authors>Avanade</Authors>
 		<Company>Avanade</Company>
diff --git a/docs/Entity-CodeGeneration-Config.md b/docs/Entity-CodeGeneration-Config.md
index 0a591004a..151e953af 100644
--- a/docs/Entity-CodeGeneration-Config.md
+++ b/docs/Entity-CodeGeneration-Config.md
@@ -35,8 +35,9 @@ Category | Description
 [`OData`](#OData) | Provides the _OData Data-layer_ configuration.
 [`HttpAgent`](#HttpAgent) | Provides the _HTTP Agent Data-layer_ configuration.
 [`gRPC`](#gRPC) | Provides the _gRPC_ configuration.
-[`Path`](#Path) | Provides the _Path (Directory)_ configuration for the generated artefacts.
-[`Namespace`](#Namespace) | Provides the _.NET Namespace_ configuration for the generated artefacts.
+[`Path`](#Path) | Provides the _Path (Directory)_ configuration.
+[`Namespace`](#Namespace) | Provides the _.NET Namespace_ configuration.
+[`Auth`](#Auth) | Provides the _Authorization_ configuration.
 [`Collections`](#Collections) | Provides related child (hierarchical) configuration.
 
 The properties with a bold name are those that are more typically used (considered more important).
@@ -188,7 +189,7 @@ Property | Description
 <br/>
 
 ## Path
-Provides the _Path (Directory)_ configuration for the generated artefacts.
+Provides the _Path (Directory)_ configuration.
 
 Property | Description
 -|-
@@ -200,7 +201,7 @@ Property | Description
 <br/>
 
 ## Namespace
-Provides the _.NET Namespace_ configuration for the generated artefacts.
+Provides the _.NET Namespace_ configuration.
 
 Property | Description
 -|-
@@ -211,6 +212,18 @@ Property | Description
 
 <br/>
 
+## Auth
+Provides the _Authorization_ configuration.
+
+Property | Description
+-|-
+`authActionCreate` | The default `Operation.AuthAction` for an `Operation.Type` of `Create`.<br/>&dagger; Defaults to `Create`.
+`authActionRead` | The default `Operation.AuthAction` for an `Operation.Type` of `Get` or `GetColl`.<br/>&dagger; Defaults to `Read`.
+`authActionUpdate` | The default `Operation.AuthAction` for an `Operation.Type` of `Update`.<br/>&dagger; Defaults to `Update`.
+`authActionDelete` | The default `Operation.AuthAction` for an `Operation.Type` of `Delete`.<br/>&dagger; Defaults to `Delete`.
+
+<br/>
+
 ## Collections
 Provides related child (hierarchical) configuration.
 
diff --git a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/Account.cs b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/Account.cs
index d0ce25cb4..f2bfa22b7 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/Account.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/Account.cs
@@ -2,91 +2,90 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-namespace Cdr.Banking.Business.Data.Model
+namespace Cdr.Banking.Business.Data.Model;
+
+/// <summary>
+/// Represents the Account model for data persistence model.
+/// </summary>
+public partial class Account : IIdentifier<string>
 {
     /// <summary>
-    /// Represents the Account model for data persistence model.
-    /// </summary>
-    public partial class Account : IIdentifier<string>
-    {
-        /// <summary>
-        /// Gets or sets the identifier.
-        /// </summary>
-        public string? Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Creation Date.
-        /// </summary>
-        public DateTime CreationDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Display Name.
-        /// </summary>
-        public string? DisplayName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Nickname.
-        /// </summary>
-        public string? Nickname { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Open Status.
-        /// </summary>
-        public string? OpenStatus { get; set; }
-
-        /// <summary>
-        /// Indicates whether Is Owned.
-        /// </summary>
-        public bool IsOwned { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Masked Number.
-        /// </summary>
-        public string? MaskedNumber { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Product Category.
-        /// </summary>
-        public string? ProductCategory { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Product Name.
-        /// </summary>
-        public string? ProductName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Bsb.
-        /// </summary>
-        public string? Bsb { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Account Number.
-        /// </summary>
-        public string? AccountNumber { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Bundle Name.
-        /// </summary>
-        public string? BundleName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Specific Account U Type.
-        /// </summary>
-        public string? SpecificAccountUType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Term Deposit.
-        /// </summary>
-        public TermDepositAccount? TermDeposit { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Credit Card.
-        /// </summary>
-        public CreditCardAccount? CreditCard { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Balance.
-        /// </summary>
-        public Balance? Balance { get; set; }
-    }
-}
\ No newline at end of file
+    /// Gets or sets the identifier.
+    /// </summary>
+    public string? Id { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Creation Date.
+    /// </summary>
+    public DateTime CreationDate { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Display Name.
+    /// </summary>
+    public string? DisplayName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Nickname.
+    /// </summary>
+    public string? Nickname { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Open Status.
+    /// </summary>
+    public string? OpenStatus { get; set; }
+
+    /// <summary>
+    /// Indicates whether Is Owned.
+    /// </summary>
+    public bool IsOwned { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Masked Number.
+    /// </summary>
+    public string? MaskedNumber { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Product Category.
+    /// </summary>
+    public string? ProductCategory { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Product Name.
+    /// </summary>
+    public string? ProductName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Bsb.
+    /// </summary>
+    public string? Bsb { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Account Number.
+    /// </summary>
+    public string? AccountNumber { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Bundle Name.
+    /// </summary>
+    public string? BundleName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Specific Account U Type.
+    /// </summary>
+    public string? SpecificAccountUType { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Term Deposit.
+    /// </summary>
+    public TermDepositAccount? TermDeposit { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Credit Card.
+    /// </summary>
+    public CreditCardAccount? CreditCard { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Balance.
+    /// </summary>
+    public Balance? Balance { get; set; }
+}
diff --git a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/AccountUType.cs b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/AccountUType.cs
index 1dac4412a..c1f8c6f16 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/AccountUType.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/AccountUType.cs
@@ -2,15 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-namespace Cdr.Banking.Business.Data.Model
-{
-    /// <summary>
-    /// Represents the Account U Type model.
-    /// </summary>
-    public partial class AccountUType : ReferenceDataBase<Guid> { }
+namespace Cdr.Banking.Business.Data.Model;
 
-    /// <summary>
-    /// Represents the <see cref="AccountUType"/> collection.
-    /// </summary>
-    public partial class AccountUTypeCollection : List<AccountUType> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the Account U Type model.
+/// </summary>
+public partial class AccountUType : ReferenceDataBase<Guid> { }
+
+/// <summary>
+/// Represents the <see cref="AccountUType"/> collection.
+/// </summary>
+public partial class AccountUTypeCollection : List<AccountUType> { }
diff --git a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/Balance.cs b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/Balance.cs
index e47768739..99a3c1575 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/Balance.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/Balance.cs
@@ -2,41 +2,40 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-namespace Cdr.Banking.Business.Data.Model
+namespace Cdr.Banking.Business.Data.Model;
+
+/// <summary>
+/// Represents the Balance model.
+/// </summary>
+public partial class Balance
 {
     /// <summary>
-    /// Represents the Balance model.
+    /// Gets or sets the Current Balance.
     /// </summary>
-    public partial class Balance
-    {
-        /// <summary>
-        /// Gets or sets the Current Balance.
-        /// </summary>
-        public decimal CurrentBalance { get; set; }
+    public decimal CurrentBalance { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Available Balance.
-        /// </summary>
-        public decimal AvailableBalance { get; set; }
+    /// <summary>
+    /// Gets or sets the Available Balance.
+    /// </summary>
+    public decimal AvailableBalance { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Credit Limit.
-        /// </summary>
-        public decimal CreditLimit { get; set; }
+    /// <summary>
+    /// Gets or sets the Credit Limit.
+    /// </summary>
+    public decimal CreditLimit { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Amortised Limit.
-        /// </summary>
-        public decimal AmortisedLimit { get; set; }
+    /// <summary>
+    /// Gets or sets the Amortised Limit.
+    /// </summary>
+    public decimal AmortisedLimit { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Currency.
-        /// </summary>
-        public string? Currency { get; set; }
+    /// <summary>
+    /// Gets or sets the Currency.
+    /// </summary>
+    public string? Currency { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Purses.
-        /// </summary>
-        public BalancePurseCollection? Purses { get; set; }
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Gets or sets the Purses.
+    /// </summary>
+    public BalancePurseCollection? Purses { get; set; }
+}
diff --git a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/BalancePurse.cs b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/BalancePurse.cs
index 3f21503ae..746957735 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/BalancePurse.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/BalancePurse.cs
@@ -2,26 +2,25 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-namespace Cdr.Banking.Business.Data.Model
+namespace Cdr.Banking.Business.Data.Model;
+
+/// <summary>
+/// Represents the <see cref="Balance"/> Purse model.
+/// </summary>
+public partial class BalancePurse
 {
     /// <summary>
-    /// Represents the <see cref="Balance"/> Purse model.
+    /// Gets or sets the Amount.
     /// </summary>
-    public partial class BalancePurse
-    {
-        /// <summary>
-        /// Gets or sets the Amount.
-        /// </summary>
-        public decimal Amount { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Currency.
-        /// </summary>
-        public string? Currency { get; set; }
-    }
+    public decimal Amount { get; set; }
 
     /// <summary>
-    /// Represents the <see cref="BalancePurse"/> collection.
+    /// Gets or sets the Currency.
     /// </summary>
-    public partial class BalancePurseCollection : List<BalancePurse> { }
-}
\ No newline at end of file
+    public string? Currency { get; set; }
+}
+
+/// <summary>
+/// Represents the <see cref="BalancePurse"/> collection.
+/// </summary>
+public partial class BalancePurseCollection : List<BalancePurse> { }
diff --git a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/CreditCardAccount.cs b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/CreditCardAccount.cs
index f49d6e3cb..b1d4f0471 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/CreditCardAccount.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/CreditCardAccount.cs
@@ -2,31 +2,30 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-namespace Cdr.Banking.Business.Data.Model
+namespace Cdr.Banking.Business.Data.Model;
+
+/// <summary>
+/// Represents the Credit Card Account model.
+/// </summary>
+public partial class CreditCardAccount
 {
     /// <summary>
-    /// Represents the Credit Card Account model.
+    /// Gets or sets the Min Payment Amount.
     /// </summary>
-    public partial class CreditCardAccount
-    {
-        /// <summary>
-        /// Gets or sets the Min Payment Amount.
-        /// </summary>
-        public decimal MinPaymentAmount { get; set; }
+    public decimal MinPaymentAmount { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Payment Due Amount.
-        /// </summary>
-        public decimal PaymentDueAmount { get; set; }
+    /// <summary>
+    /// Gets or sets the Payment Due Amount.
+    /// </summary>
+    public decimal PaymentDueAmount { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Payment Currency.
-        /// </summary>
-        public string? PaymentCurrency { get; set; }
+    /// <summary>
+    /// Gets or sets the Payment Currency.
+    /// </summary>
+    public string? PaymentCurrency { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Payment Due Date.
-        /// </summary>
-        public DateTime PaymentDueDate { get; set; }
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Gets or sets the Payment Due Date.
+    /// </summary>
+    public DateTime PaymentDueDate { get; set; }
+}
diff --git a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/MaturityInstructions.cs b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/MaturityInstructions.cs
index ff0a2b6e4..fa9718228 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/MaturityInstructions.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/MaturityInstructions.cs
@@ -2,15 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-namespace Cdr.Banking.Business.Data.Model
-{
-    /// <summary>
-    /// Represents the Maturity Instructions model.
-    /// </summary>
-    public partial class MaturityInstructions : ReferenceDataBase<Guid> { }
+namespace Cdr.Banking.Business.Data.Model;
 
-    /// <summary>
-    /// Represents the <see cref="MaturityInstructions"/> collection.
-    /// </summary>
-    public partial class MaturityInstructionsCollection : List<MaturityInstructions> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the Maturity Instructions model.
+/// </summary>
+public partial class MaturityInstructions : ReferenceDataBase<Guid> { }
+
+/// <summary>
+/// Represents the <see cref="MaturityInstructions"/> collection.
+/// </summary>
+public partial class MaturityInstructionsCollection : List<MaturityInstructions> { }
diff --git a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/OpenStatus.cs b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/OpenStatus.cs
index 2b28a3277..da73c0c30 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/OpenStatus.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/OpenStatus.cs
@@ -2,15 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-namespace Cdr.Banking.Business.Data.Model
-{
-    /// <summary>
-    /// Represents the Open Status model.
-    /// </summary>
-    public partial class OpenStatus : ReferenceDataBase<Guid> { }
+namespace Cdr.Banking.Business.Data.Model;
 
-    /// <summary>
-    /// Represents the <see cref="OpenStatus"/> collection.
-    /// </summary>
-    public partial class OpenStatusCollection : List<OpenStatus> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the Open Status model.
+/// </summary>
+public partial class OpenStatus : ReferenceDataBase<Guid> { }
+
+/// <summary>
+/// Represents the <see cref="OpenStatus"/> collection.
+/// </summary>
+public partial class OpenStatusCollection : List<OpenStatus> { }
diff --git a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/ProductCategory.cs b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/ProductCategory.cs
index 51ab1f4d6..3cf1cdc44 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/ProductCategory.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/ProductCategory.cs
@@ -2,15 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-namespace Cdr.Banking.Business.Data.Model
-{
-    /// <summary>
-    /// Represents the Product Category model.
-    /// </summary>
-    public partial class ProductCategory : ReferenceDataBase<Guid> { }
+namespace Cdr.Banking.Business.Data.Model;
 
-    /// <summary>
-    /// Represents the <see cref="ProductCategory"/> collection.
-    /// </summary>
-    public partial class ProductCategoryCollection : List<ProductCategory> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the Product Category model.
+/// </summary>
+public partial class ProductCategory : ReferenceDataBase<Guid> { }
+
+/// <summary>
+/// Represents the <see cref="ProductCategory"/> collection.
+/// </summary>
+public partial class ProductCategoryCollection : List<ProductCategory> { }
diff --git a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/TermDepositAccount.cs b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/TermDepositAccount.cs
index 585988a6c..2346fce10 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/TermDepositAccount.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/TermDepositAccount.cs
@@ -2,36 +2,35 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-namespace Cdr.Banking.Business.Data.Model
+namespace Cdr.Banking.Business.Data.Model;
+
+/// <summary>
+/// Represents the Term Deposit Account model.
+/// </summary>
+public partial class TermDepositAccount
 {
     /// <summary>
-    /// Represents the Term Deposit Account model.
+    /// Gets or sets the Lodgement Date.
     /// </summary>
-    public partial class TermDepositAccount
-    {
-        /// <summary>
-        /// Gets or sets the Lodgement Date.
-        /// </summary>
-        public DateTime LodgementDate { get; set; }
+    public DateTime LodgementDate { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Maturity Date.
-        /// </summary>
-        public DateTime MaturityDate { get; set; }
+    /// <summary>
+    /// Gets or sets the Maturity Date.
+    /// </summary>
+    public DateTime MaturityDate { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Maturity Amount.
-        /// </summary>
-        public decimal MaturityAmount { get; set; }
+    /// <summary>
+    /// Gets or sets the Maturity Amount.
+    /// </summary>
+    public decimal MaturityAmount { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Maturity Currency.
-        /// </summary>
-        public string? MaturityCurrency { get; set; }
+    /// <summary>
+    /// Gets or sets the Maturity Currency.
+    /// </summary>
+    public string? MaturityCurrency { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Maturity Instructions.
-        /// </summary>
-        public string? MaturityInstructions { get; set; }
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Gets or sets the Maturity Instructions.
+    /// </summary>
+    public string? MaturityInstructions { get; set; }
+}
diff --git a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/Transaction.cs b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/Transaction.cs
index e8f86f4a9..3b72ced50 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/Transaction.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/Transaction.cs
@@ -2,96 +2,95 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-namespace Cdr.Banking.Business.Data.Model
+namespace Cdr.Banking.Business.Data.Model;
+
+/// <summary>
+/// Represents the Transaction model for data persistence model.
+/// </summary>
+public partial class Transaction : IIdentifier<string>
 {
     /// <summary>
-    /// Represents the Transaction model for data persistence model.
-    /// </summary>
-    public partial class Transaction : IIdentifier<string>
-    {
-        /// <summary>
-        /// Gets or sets the identifier.
-        /// </summary>
-        public string? Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Account Id.
-        /// </summary>
-        public string? AccountId { get; set; }
-
-        /// <summary>
-        /// Indicates whether Is Detail Available.
-        /// </summary>
-        public bool IsDetailAvailable { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Type.
-        /// </summary>
-        public string? Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Status.
-        /// </summary>
-        public string? Status { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Description.
-        /// </summary>
-        public string? Description { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Posting Date Time.
-        /// </summary>
-        public DateTime PostingDateTime { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Execution Date Time.
-        /// </summary>
-        public DateTime ExecutionDateTime { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Amount.
-        /// </summary>
-        public decimal Amount { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Currency.
-        /// </summary>
-        public string? Currency { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Reference.
-        /// </summary>
-        public string? Reference { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Merchant Name.
-        /// </summary>
-        public string? MerchantName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Merchant Category Code.
-        /// </summary>
-        public string? MerchantCategoryCode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Biller Code.
-        /// </summary>
-        public string? BillerCode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Biller Name.
-        /// </summary>
-        public string? BillerName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Apca Number.
-        /// </summary>
-        public string? ApcaNumber { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Transaction Date Time.
-        /// </summary>
-        public DateTime TransactionDateTime { get; set; }
-    }
-}
\ No newline at end of file
+    /// Gets or sets the identifier.
+    /// </summary>
+    public string? Id { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Account Id.
+    /// </summary>
+    public string? AccountId { get; set; }
+
+    /// <summary>
+    /// Indicates whether Is Detail Available.
+    /// </summary>
+    public bool IsDetailAvailable { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Type.
+    /// </summary>
+    public string? Type { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Status.
+    /// </summary>
+    public string? Status { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Description.
+    /// </summary>
+    public string? Description { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Posting Date Time.
+    /// </summary>
+    public DateTime PostingDateTime { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Execution Date Time.
+    /// </summary>
+    public DateTime ExecutionDateTime { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Amount.
+    /// </summary>
+    public decimal Amount { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Currency.
+    /// </summary>
+    public string? Currency { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Reference.
+    /// </summary>
+    public string? Reference { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Merchant Name.
+    /// </summary>
+    public string? MerchantName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Merchant Category Code.
+    /// </summary>
+    public string? MerchantCategoryCode { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Biller Code.
+    /// </summary>
+    public string? BillerCode { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Biller Name.
+    /// </summary>
+    public string? BillerName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Apca Number.
+    /// </summary>
+    public string? ApcaNumber { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Transaction Date Time.
+    /// </summary>
+    public DateTime TransactionDateTime { get; set; }
+}
diff --git a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/TransactionStatus.cs b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/TransactionStatus.cs
index a0f37b4fb..43a75bbcf 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/TransactionStatus.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/TransactionStatus.cs
@@ -2,15 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-namespace Cdr.Banking.Business.Data.Model
-{
-    /// <summary>
-    /// Represents the Transaction Status model.
-    /// </summary>
-    public partial class TransactionStatus : ReferenceDataBase<Guid> { }
+namespace Cdr.Banking.Business.Data.Model;
 
-    /// <summary>
-    /// Represents the <see cref="TransactionStatus"/> collection.
-    /// </summary>
-    public partial class TransactionStatusCollection : List<TransactionStatus> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the Transaction Status model.
+/// </summary>
+public partial class TransactionStatus : ReferenceDataBase<Guid> { }
+
+/// <summary>
+/// Represents the <see cref="TransactionStatus"/> collection.
+/// </summary>
+public partial class TransactionStatusCollection : List<TransactionStatus> { }
diff --git a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/TransactionType.cs b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/TransactionType.cs
index 4b02b86eb..693e0b642 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/TransactionType.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Business/Data/Model/Generated/TransactionType.cs
@@ -2,15 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-namespace Cdr.Banking.Business.Data.Model
-{
-    /// <summary>
-    /// Represents the Transaction Type model.
-    /// </summary>
-    public partial class TransactionType : ReferenceDataBase<Guid> { }
+namespace Cdr.Banking.Business.Data.Model;
 
-    /// <summary>
-    /// Represents the <see cref="TransactionType"/> collection.
-    /// </summary>
-    public partial class TransactionTypeCollection : List<TransactionType> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the Transaction Type model.
+/// </summary>
+public partial class TransactionType : ReferenceDataBase<Guid> { }
+
+/// <summary>
+/// Represents the <see cref="TransactionType"/> collection.
+/// </summary>
+public partial class TransactionTypeCollection : List<TransactionType> { }
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/AccountAgent.cs b/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/AccountAgent.cs
index 08ea97628..454c9cd07 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/AccountAgent.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/AccountAgent.cs
@@ -2,50 +2,38 @@
  * This file is automatically generated; any changes will be lost.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using Cdr.Banking.Common.Entities;
-using RefDataNamespace = Cdr.Banking.Common.Entities;
+namespace Cdr.Banking.Common.Agents;
 
-namespace Cdr.Banking.Common.Agents
+/// <summary>
+/// Provides the <see cref="Account"/> HTTP agent.
+/// </summary>
+public partial class AccountAgent : TypedHttpClientBase<AccountAgent>, IAccountAgent
 {
     /// <summary>
-    /// Provides the <see cref="Account"/> HTTP agent.
+    /// Initializes a new instance of the <see cref="AccountAgent"/> class.
     /// </summary>
-    public partial class AccountAgent : TypedHttpClientBase<AccountAgent>, IAccountAgent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AccountAgent"/> class.
-        /// </summary>
-        /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
-        /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
-        public AccountAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
+    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
+    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
+    /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
+    public AccountAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
 
-        /// <inheritdoc/>
-        public Task<HttpResult<AccountCollectionResult>> GetAccountsAsync(AccountArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<AccountCollectionResult>("api/v1/banking/accounts", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(new HttpArg<AccountArgs?>("args", args, HttpArgType.FromUriUseProperties)), cancellationToken: cancellationToken);
+    /// <inheritdoc/>
+    public Task<HttpResult<AccountCollectionResult>> GetAccountsAsync(AccountArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<AccountCollectionResult>("api/v1/banking/accounts", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(new HttpArg<AccountArgs?>("args", args, HttpArgType.FromUriUseProperties)), cancellationToken: cancellationToken);
 
-        /// <inheritdoc/>
-        public Task<HttpResult<AccountCollectionResult>> GetAccountsQueryAsync(QueryArgs? query = null, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<AccountCollectionResult>("api/v1/banking/accounts/query", requestOptions: requestOptions.IncludeQuery(query).IncludePaging(paging), args: HttpArgs.Create(), cancellationToken: cancellationToken);
+    /// <inheritdoc/>
+    public Task<HttpResult<AccountCollectionResult>> GetAccountsQueryAsync(QueryArgs? query = null, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<AccountCollectionResult>("api/v1/banking/accounts/query", requestOptions: requestOptions.IncludeQuery(query).IncludePaging(paging), args: HttpArgs.Create(), cancellationToken: cancellationToken);
 
-        /// <inheritdoc/>
-        public Task<HttpResult<AccountDetail?>> GetDetailAsync(string? accountId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<AccountDetail?>("api/v1/banking/accounts/{accountId}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<string?>("accountId", accountId)), cancellationToken: cancellationToken);
+    /// <inheritdoc/>
+    public Task<HttpResult<AccountDetail?>> GetDetailAsync(string? accountId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<AccountDetail?>("api/v1/banking/accounts/{accountId}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<string?>("accountId", accountId)), cancellationToken: cancellationToken);
 
-        /// <inheritdoc/>
-        public Task<HttpResult<Balance?>> GetBalanceAsync(string? accountId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<Balance?>("api/v1/banking/accounts/{accountId}/balance", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<string?>("accountId", accountId)), cancellationToken: cancellationToken);
+    /// <inheritdoc/>
+    public Task<HttpResult<Balance?>> GetBalanceAsync(string? accountId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<Balance?>("api/v1/banking/accounts/{accountId}/balance", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<string?>("accountId", accountId)), cancellationToken: cancellationToken);
 
-        /// <inheritdoc/>
-        public Task<HttpResult> GetStatementAsync(string? accountId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync("api/v1/banking/accounts/{accountId}/statement", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<string?>("accountId", accountId)), cancellationToken: cancellationToken);
-    }
+    /// <inheritdoc/>
+    public Task<HttpResult> GetStatementAsync(string? accountId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync("api/v1/banking/accounts/{accountId}/statement", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<string?>("accountId", accountId)), cancellationToken: cancellationToken);
 }
\ No newline at end of file
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/IAccountAgent.cs b/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/IAccountAgent.cs
index 6842fd6bc..c3a3d6f56 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/IAccountAgent.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/IAccountAgent.cs
@@ -2,71 +2,57 @@
  * This file is automatically generated; any changes will be lost.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using Microsoft.Extensions.Logging;
-using Cdr.Banking.Common.Entities;
-using RefDataNamespace = Cdr.Banking.Common.Entities;
+namespace Cdr.Banking.Common.Agents;
 
-namespace Cdr.Banking.Common.Agents
+/// <summary>
+/// Defines the <see cref="Account"/> HTTP agent.
+/// </summary>
+public partial interface IAccountAgent
 {
     /// <summary>
-    /// Defines the <see cref="Account"/> HTTP agent.
+    /// Get all accounts.
     /// </summary>
-    public partial interface IAccountAgent
-    {
-        /// <summary>
-        /// Get all accounts.
-        /// </summary>
-        /// <param name="args">The Args (see <see cref="AccountArgs"/>).</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<AccountCollectionResult>> GetAccountsAsync(AccountArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <param name="args">The Args (see <see cref="AccountArgs"/>).</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<AccountCollectionResult>> GetAccountsAsync(AccountArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Get all accounts.
-        /// </summary>
-        /// <param name="query">The <see cref="QueryArgs"/>.</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<AccountCollectionResult>> GetAccountsQueryAsync(QueryArgs? query = null, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Get all accounts.
+    /// </summary>
+    /// <param name="query">The <see cref="QueryArgs"/>.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<AccountCollectionResult>> GetAccountsQueryAsync(QueryArgs? query = null, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Get <see cref="AccountDetail"/>.
-        /// </summary>
-        /// <param name="accountId">The <see cref="Account"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<AccountDetail?>> GetDetailAsync(string? accountId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Get <see cref="AccountDetail"/>.
+    /// </summary>
+    /// <param name="accountId">The <see cref="Account"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<AccountDetail?>> GetDetailAsync(string? accountId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Get <see cref="Account"/> <see cref="Balance"/>.
-        /// </summary>
-        /// <param name="accountId">The <see cref="Account"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Balance?>> GetBalanceAsync(string? accountId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Get <see cref="Account"/> <see cref="Balance"/>.
+    /// </summary>
+    /// <param name="accountId">The <see cref="Account"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Balance?>> GetBalanceAsync(string? accountId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Get <see cref="Account"/> statement (file).
-        /// </summary>
-        /// <param name="accountId">The <see cref="Account"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult> GetStatementAsync(string? accountId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-    }
+    /// <summary>
+    /// Get <see cref="Account"/> statement (file).
+    /// </summary>
+    /// <param name="accountId">The <see cref="Account"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult> GetStatementAsync(string? accountId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/IReferenceDataAgent.cs b/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/IReferenceDataAgent.cs
index 08baeeb3f..1ad06ef57 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/IReferenceDataAgent.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/IReferenceDataAgent.cs
@@ -2,89 +2,74 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using CoreEx.RefData;
-using Microsoft.Extensions.Logging;
-using Cdr.Banking.Common.Entities;
-using RefDataNamespace = Cdr.Banking.Common.Entities;
+namespace Cdr.Banking.Common.Agents;
 
-namespace Cdr.Banking.Common.Agents
+/// <summary>
+/// Defines the <b>ReferenceData</b> HTTP agent.
+/// </summary>
+public partial interface IReferenceDataAgent
 {
     /// <summary>
-    /// Defines the <b>ReferenceData</b> HTTP agent.
+    /// Gets all of the <see cref="RefDataNamespace.OpenStatus"/> items that match the filter arguments.
     /// </summary>
-    public partial interface IReferenceDataAgent
-    {
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.OpenStatus"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.OpenStatusCollection>> OpenStatusGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.OpenStatusCollection>> OpenStatusGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.ProductCategory"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.ProductCategoryCollection>> ProductCategoryGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets all of the <see cref="RefDataNamespace.ProductCategory"/> items that match the filter arguments.
+    /// </summary>
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.ProductCategoryCollection>> ProductCategoryGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.AccountUType"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.AccountUTypeCollection>> AccountUTypeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets all of the <see cref="RefDataNamespace.AccountUType"/> items that match the filter arguments.
+    /// </summary>
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.AccountUTypeCollection>> AccountUTypeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.MaturityInstructions"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.MaturityInstructionsCollection>> MaturityInstructionsGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets all of the <see cref="RefDataNamespace.MaturityInstructions"/> items that match the filter arguments.
+    /// </summary>
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.MaturityInstructionsCollection>> MaturityInstructionsGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.TransactionType"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.TransactionTypeCollection>> TransactionTypeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets all of the <see cref="RefDataNamespace.TransactionType"/> items that match the filter arguments.
+    /// </summary>
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.TransactionTypeCollection>> TransactionTypeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.TransactionStatus"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.TransactionStatusCollection>> TransactionStatusGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets all of the <see cref="RefDataNamespace.TransactionStatus"/> items that match the filter arguments.
+    /// </summary>
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.TransactionStatusCollection>> TransactionStatusGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets the reference data entries for the specified entities and codes from the query string; e.g: api/v1/ref?entity=codeX,codeY&amp;entity2=codeZ&amp;entity3
-        /// </summary>
-        /// <param name="names">The optional list of reference data names.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        /// <remarks>The reference data objects will need to be manually extracted from the corresponding response content.</remarks>
-        Task<HttpResult> GetNamedAsync(string[] names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-    }
+    /// <summary>
+    /// Gets the reference data entries for the specified entities and codes from the query string; e.g: api/v1/ref?entity=codeX,codeY&amp;entity2=codeZ&amp;entity3
+    /// </summary>
+    /// <param name="names">The optional list of reference data names.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    /// <remarks>The reference data objects will need to be manually extracted from the corresponding response content.</remarks>
+    Task<HttpResult> GetNamedAsync(string[] names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/ITransactionAgent.cs b/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/ITransactionAgent.cs
index 108593608..e52aa5f74 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/ITransactionAgent.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/ITransactionAgent.cs
@@ -2,35 +2,21 @@
  * This file is automatically generated; any changes will be lost.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using Microsoft.Extensions.Logging;
-using Cdr.Banking.Common.Entities;
-using RefDataNamespace = Cdr.Banking.Common.Entities;
+namespace Cdr.Banking.Common.Agents;
 
-namespace Cdr.Banking.Common.Agents
+/// <summary>
+/// Defines the <see cref="Transaction"/> HTTP agent.
+/// </summary>
+public partial interface ITransactionAgent
 {
     /// <summary>
-    /// Defines the <see cref="Transaction"/> HTTP agent.
+    /// Get transaction for account.
     /// </summary>
-    public partial interface ITransactionAgent
-    {
-        /// <summary>
-        /// Get transaction for account.
-        /// </summary>
-        /// <param name="accountId">The Account Id.</param>
-        /// <param name="args">The Args (see <see cref="TransactionArgs"/>).</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<TransactionCollectionResult>> GetTransactionsAsync(string? accountId, TransactionArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-    }
+    /// <param name="accountId">The Account Id.</param>
+    /// <param name="args">The Args (see <see cref="TransactionArgs"/>).</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<TransactionCollectionResult>> GetTransactionsAsync(string? accountId, TransactionArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/ReferenceDataAgent.cs b/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/ReferenceDataAgent.cs
index 7b8d09c0e..877fb7d7f 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/ReferenceDataAgent.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/ReferenceDataAgent.cs
@@ -2,65 +2,52 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using CoreEx.RefData;
-using Cdr.Banking.Common.Entities;
-using RefDataNamespace = Cdr.Banking.Common.Entities;
+namespace Cdr.Banking.Common.Agents;
 
-namespace Cdr.Banking.Common.Agents
+/// <summary>
+/// Provides the <b>ReferenceData</b> HTTP agent.
+/// </summary>
+public partial class ReferenceDataAgent : TypedHttpClientBase<ReferenceDataAgent>, IReferenceDataAgent
 {
     /// <summary>
-    /// Provides the <b>ReferenceData</b> HTTP agent.
+    /// Initializes a new instance of the <see cref="ReferenceDataAgent"/> class.
     /// </summary>
-    public partial class ReferenceDataAgent : TypedHttpClientBase<ReferenceDataAgent>, IReferenceDataAgent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReferenceDataAgent"/> class.
-        /// </summary>
-        /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
-        /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
-        public ReferenceDataAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
+    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
+    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
+    /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
+    public ReferenceDataAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
 
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.OpenStatusCollection>> OpenStatusGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.OpenStatusCollection>("api/v1/ref/openstatuses", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.OpenStatusCollection>> OpenStatusGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.OpenStatusCollection>("api/v1/ref/openstatuses", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
 
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.ProductCategoryCollection>> ProductCategoryGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.ProductCategoryCollection>("api/v1/ref/productcategories", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.ProductCategoryCollection>> ProductCategoryGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.ProductCategoryCollection>("api/v1/ref/productcategories", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
 
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.AccountUTypeCollection>> AccountUTypeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.AccountUTypeCollection>("api/v1/ref/accountutypes", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.AccountUTypeCollection>> AccountUTypeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.AccountUTypeCollection>("api/v1/ref/accountutypes", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
 
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.MaturityInstructionsCollection>> MaturityInstructionsGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.MaturityInstructionsCollection>("api/v1/ref/maturityinstructions", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.MaturityInstructionsCollection>> MaturityInstructionsGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.MaturityInstructionsCollection>("api/v1/ref/maturityinstructions", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
 
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.TransactionTypeCollection>> TransactionTypeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.TransactionTypeCollection>("api/v1/ref/transactiontypes", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.TransactionTypeCollection>> TransactionTypeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.TransactionTypeCollection>("api/v1/ref/transactiontypes", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
 
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.TransactionStatusCollection>> TransactionStatusGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.TransactionStatusCollection>("api/v1/ref/transactionstatuses", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.TransactionStatusCollection>> TransactionStatusGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.TransactionStatusCollection>("api/v1/ref/transactionstatuses", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
 
-        /// <inheritdoc/>
-        public Task<HttpResult> GetNamedAsync(string[] names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-        {
-            var ro = requestOptions ?? new HttpRequestOptions();
-            if (names != null)
-                ro.UrlQueryString += string.Join("&", names);
-                
-            return GetAsync("api/v1/ref", ro, null, cancellationToken);
-        }
+    /// <inheritdoc/>
+    public Task<HttpResult> GetNamedAsync(string[] names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+    {
+        var ro = requestOptions ?? new HttpRequestOptions();
+        if (names != null)
+            ro.UrlQueryString += string.Join("&", names);
+            
+        return GetAsync("api/v1/ref", ro, null, cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/TransactionAgent.cs b/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/TransactionAgent.cs
index b2e3be7c8..2b21ac33c 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/TransactionAgent.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Agents/Generated/TransactionAgent.cs
@@ -2,34 +2,22 @@
  * This file is automatically generated; any changes will be lost.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using Cdr.Banking.Common.Entities;
-using RefDataNamespace = Cdr.Banking.Common.Entities;
+namespace Cdr.Banking.Common.Agents;
 
-namespace Cdr.Banking.Common.Agents
+/// <summary>
+/// Provides the <see cref="Transaction"/> HTTP agent.
+/// </summary>
+public partial class TransactionAgent : TypedHttpClientBase<TransactionAgent>, ITransactionAgent
 {
     /// <summary>
-    /// Provides the <see cref="Transaction"/> HTTP agent.
+    /// Initializes a new instance of the <see cref="TransactionAgent"/> class.
     /// </summary>
-    public partial class TransactionAgent : TypedHttpClientBase<TransactionAgent>, ITransactionAgent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TransactionAgent"/> class.
-        /// </summary>
-        /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
-        /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
-        public TransactionAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
+    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
+    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
+    /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
+    public TransactionAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
 
-        /// <inheritdoc/>
-        public Task<HttpResult<TransactionCollectionResult>> GetTransactionsAsync(string? accountId, TransactionArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<TransactionCollectionResult>("api/v1/banking/accounts/{accountId}/transactions", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(new HttpArg<string?>("accountId", accountId), new HttpArg<TransactionArgs?>("args", args, HttpArgType.FromUriUseProperties)), cancellationToken: cancellationToken);
-    }
+    /// <inheritdoc/>
+    public Task<HttpResult<TransactionCollectionResult>> GetTransactionsAsync(string? accountId, TransactionArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<TransactionCollectionResult>("api/v1/banking/accounts/{accountId}/transactions", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(new HttpArg<string?>("accountId", accountId), new HttpArg<TransactionArgs?>("args", args, HttpArgType.FromUriUseProperties)), cancellationToken: cancellationToken);
 }
\ No newline at end of file
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Cdr.Banking.Common.csproj b/samples/Cdr.Banking/Cdr.Banking.Common/Cdr.Banking.Common.csproj
index ecec905fd..ac6240eab 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Cdr.Banking.Common.csproj
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Cdr.Banking.Common.csproj
@@ -2,6 +2,8 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <Nullable>enable</Nullable>
+    <LangVersion>Preview</LangVersion>
+    <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="Agents\" />
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/Account.cs b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/Account.cs
index 38366f6f1..9b737da68 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/Account.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/Account.cs
@@ -2,92 +2,85 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Cdr.Banking.Common.Entities;
 
-namespace Cdr.Banking.Common.Entities
+/// <summary>
+/// Represents the Account entity.
+/// </summary>
+public partial class Account : IIdentifier<string>
 {
     /// <summary>
-    /// Represents the Account entity.
+    /// Gets or sets the identifier.
     /// </summary>
-    public partial class Account : IIdentifier<string>
-    {
-        /// <summary>
-        /// Gets or sets the identifier.
-        /// </summary>
-        [JsonPropertyName("accountId")]
-        public string? Id { get; set; }
+    [JsonPropertyName("accountId")]
+    public string? Id { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Creation Date.
-        /// </summary>
-        public DateTime CreationDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Display Name.
-        /// </summary>
-        public string? DisplayName { get; set; }
+    /// <summary>
+    /// Gets or sets the Creation Date.
+    /// </summary>
+    public DateTime CreationDate { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Nickname.
-        /// </summary>
-        public string? Nickname { get; set; }
+    /// <summary>
+    /// Gets or sets the Display Name.
+    /// </summary>
+    public string? DisplayName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Open Status code.
-        /// </summary>
-        public string? OpenStatus { get; set; }
+    /// <summary>
+    /// Gets or sets the Nickname.
+    /// </summary>
+    public string? Nickname { get; set; }
 
-        /// <summary>
-        /// Indicates whether Is Owned.
-        /// </summary>
-        public bool IsOwned { get; set; }
+    /// <summary>
+    /// Gets or sets the Open Status code.
+    /// </summary>
+    public string? OpenStatus { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Masked Number.
-        /// </summary>
-        public string? MaskedNumber { get; set; }
+    /// <summary>
+    /// Indicates whether Is Owned.
+    /// </summary>
+    public bool IsOwned { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Product Category code.
-        /// </summary>
-        public string? ProductCategory { get; set; }
+    /// <summary>
+    /// Gets or sets the Masked Number.
+    /// </summary>
+    public string? MaskedNumber { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Product Name.
-        /// </summary>
-        public string? ProductName { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the Product Category code.
+    /// </summary>
+    public string? ProductCategory { get; set; }
 
     /// <summary>
-    /// Represents the <c>Account</c> collection.
+    /// Gets or sets the Product Name.
     /// </summary>
-    public partial class AccountCollection : List<Account> { }
+    public string? ProductName { get; set; }
+}
+
+/// <summary>
+/// Represents the <c>Account</c> collection.
+/// </summary>
+public partial class AccountCollection : List<Account> { }
 
+/// <summary>
+/// Represents the <c>Account</c> collection result.
+/// </summary>
+public class AccountCollectionResult : CollectionResult<AccountCollection, Account>
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AccountCollectionResult"/> class.
+    /// </summary>
+    public AccountCollectionResult() { }
+    
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AccountCollectionResult"/> class with <paramref name="paging"/>.
+    /// </summary>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public AccountCollectionResult(PagingArgs? paging) : base(paging) { }
+    
     /// <summary>
-    /// Represents the <c>Account</c> collection result.
+    /// Initializes a new instance of the <see cref="AccountCollectionResult"/> class with <paramref name="items"/> to add.
     /// </summary>
-    public class AccountCollectionResult : CollectionResult<AccountCollection, Account>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AccountCollectionResult"/> class.
-        /// </summary>
-        public AccountCollectionResult() { }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AccountCollectionResult"/> class with <paramref name="paging"/>.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public AccountCollectionResult(PagingArgs? paging) : base(paging) { }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AccountCollectionResult"/> class with <paramref name="items"/> to add.
-        /// </summary>
-        /// <param name="items">The items to add.</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public AccountCollectionResult(IEnumerable<Account> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
-    }
-}
\ No newline at end of file
+    /// <param name="items">The items to add.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public AccountCollectionResult(IEnumerable<Account> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
+}
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/AccountArgs.cs b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/AccountArgs.cs
index b013b7ebd..4ae6f748e 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/AccountArgs.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/AccountArgs.cs
@@ -2,35 +2,28 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Cdr.Banking.Common.Entities;
 
-namespace Cdr.Banking.Common.Entities
+/// <summary>
+/// Represents the <c>Account</c> arguments entity.
+/// </summary>
+public partial class AccountArgs
 {
     /// <summary>
-    /// Represents the <c>Account</c> arguments entity.
+    /// Gets or sets the Product Category code.
     /// </summary>
-    public partial class AccountArgs
-    {
-        /// <summary>
-        /// Gets or sets the Product Category code.
-        /// </summary>
-        [JsonPropertyName("product-category")]
-        public string? ProductCategory { get; set; }
+    [JsonPropertyName("product-category")]
+    public string? ProductCategory { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Open Status code.
-        /// </summary>
-        [JsonPropertyName("open-status")]
-        public string? OpenStatus { get; set; }
+    /// <summary>
+    /// Gets or sets the Open Status code.
+    /// </summary>
+    [JsonPropertyName("open-status")]
+    public string? OpenStatus { get; set; }
 
-        /// <summary>
-        /// Indicates whether Is Owned.
-        /// </summary>
-        [JsonPropertyName("is-owned")]
-        public bool? IsOwned { get; set; }
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Indicates whether Is Owned.
+    /// </summary>
+    [JsonPropertyName("is-owned")]
+    public bool? IsOwned { get; set; }
+}
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/AccountDetail.cs b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/AccountDetail.cs
index 8b1656ad2..12ed10370 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/AccountDetail.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/AccountDetail.cs
@@ -2,47 +2,40 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Cdr.Banking.Common.Entities;
 
-namespace Cdr.Banking.Common.Entities
+/// <summary>
+/// Represents the <c>Account</c> Detail entity.
+/// </summary>
+public partial class AccountDetail : Account
 {
     /// <summary>
-    /// Represents the <c>Account</c> Detail entity.
+    /// Gets or sets the Bsb.
     /// </summary>
-    public partial class AccountDetail : Account
-    {
-        /// <summary>
-        /// Gets or sets the Bsb.
-        /// </summary>
-        public string? Bsb { get; set; }
+    public string? Bsb { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Account Number.
-        /// </summary>
-        public string? AccountNumber { get; set; }
+    /// <summary>
+    /// Gets or sets the Account Number.
+    /// </summary>
+    public string? AccountNumber { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Bundle Name.
-        /// </summary>
-        public string? BundleName { get; set; }
+    /// <summary>
+    /// Gets or sets the Bundle Name.
+    /// </summary>
+    public string? BundleName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Specific Account U Type code.
-        /// </summary>
-        public string? SpecificAccountUType { get; set; }
+    /// <summary>
+    /// Gets or sets the Specific Account U Type code.
+    /// </summary>
+    public string? SpecificAccountUType { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Term Deposit.
-        /// </summary>
-        public TermDepositAccount? TermDeposit { get; set; }
+    /// <summary>
+    /// Gets or sets the Term Deposit.
+    /// </summary>
+    public TermDepositAccount? TermDeposit { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Credit Card.
-        /// </summary>
-        public CreditCardAccount? CreditCard { get; set; }
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Gets or sets the Credit Card.
+    /// </summary>
+    public CreditCardAccount? CreditCard { get; set; }
+}
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/AccountUType.cs b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/AccountUType.cs
index e1519663f..2399dafda 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/AccountUType.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/AccountUType.cs
@@ -2,22 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace Cdr.Banking.Common.Entities;
 
-namespace Cdr.Banking.Common.Entities
-{
-    /// <summary>
-    /// Represents the Account U Type entity.
-    /// </summary>
-    public partial class AccountUType : ReferenceDataBase<Guid> { }
+/// <summary>
+/// Represents the Account U Type entity.
+/// </summary>
+public partial class AccountUType : ReferenceDataBase<Guid> { }
 
-    /// <summary>
-    /// Represents the <c>AccountUType</c> collection.
-    /// </summary>
-    public partial class AccountUTypeCollection : List<AccountUType> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the <c>AccountUType</c> collection.
+/// </summary>
+public partial class AccountUTypeCollection : List<AccountUType> { }
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/Balance.cs b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/Balance.cs
index a6a15bff3..8afbb4db3 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/Balance.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/Balance.cs
@@ -2,55 +2,48 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Cdr.Banking.Common.Entities;
 
-namespace Cdr.Banking.Common.Entities
+/// <summary>
+/// Represents the Balance entity.
+/// </summary>
+public partial class Balance : IIdentifier<string>
 {
     /// <summary>
-    /// Represents the Balance entity.
+    /// Gets or sets the <c>Account</c> identifier.
     /// </summary>
-    public partial class Balance : IIdentifier<string>
-    {
-        /// <summary>
-        /// Gets or sets the <c>Account</c> identifier.
-        /// </summary>
-        [JsonPropertyName("accountId")]
-        public string? Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Current Balance.
-        /// </summary>
-        [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-        public decimal CurrentBalance { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Available Balance.
-        /// </summary>
-        [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-        public decimal AvailableBalance { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Credit Limit.
-        /// </summary>
-        public decimal CreditLimit { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Amortised Limit.
-        /// </summary>
-        public decimal AmortisedLimit { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Currency.
-        /// </summary>
-        public string? Currency { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Purses.
-        /// </summary>
-        public BalancePurseCollection? Purses { get; set; }
-    }
-}
\ No newline at end of file
+    [JsonPropertyName("accountId")]
+    public string? Id { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Current Balance.
+    /// </summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
+    public decimal CurrentBalance { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Available Balance.
+    /// </summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
+    public decimal AvailableBalance { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Credit Limit.
+    /// </summary>
+    public decimal CreditLimit { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Amortised Limit.
+    /// </summary>
+    public decimal AmortisedLimit { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Currency.
+    /// </summary>
+    public string? Currency { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Purses.
+    /// </summary>
+    public BalancePurseCollection? Purses { get; set; }
+}
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/BalancePurse.cs b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/BalancePurse.cs
index 1a75eef82..d3d34fe50 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/BalancePurse.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/BalancePurse.cs
@@ -2,32 +2,25 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Cdr.Banking.Common.Entities;
 
-namespace Cdr.Banking.Common.Entities
+/// <summary>
+/// Represents the <c>Balance</c> Purse entity.
+/// </summary>
+public partial class BalancePurse
 {
     /// <summary>
-    /// Represents the <c>Balance</c> Purse entity.
+    /// Gets or sets the Amount.
     /// </summary>
-    public partial class BalancePurse
-    {
-        /// <summary>
-        /// Gets or sets the Amount.
-        /// </summary>
-        public decimal Amount { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Currency.
-        /// </summary>
-        public string? Currency { get; set; }
-    }
+    public decimal Amount { get; set; }
 
     /// <summary>
-    /// Represents the <c>BalancePurse</c> collection.
+    /// Gets or sets the Currency.
     /// </summary>
-    public partial class BalancePurseCollection : List<BalancePurse> { }
-}
\ No newline at end of file
+    public string? Currency { get; set; }
+}
+
+/// <summary>
+/// Represents the <c>BalancePurse</c> collection.
+/// </summary>
+public partial class BalancePurseCollection : List<BalancePurse> { }
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/CreditCardAccount.cs b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/CreditCardAccount.cs
index 941b0057a..1c217b584 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/CreditCardAccount.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/CreditCardAccount.cs
@@ -2,37 +2,30 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Cdr.Banking.Common.Entities;
 
-namespace Cdr.Banking.Common.Entities
+/// <summary>
+/// Represents the Credit Card Account entity.
+/// </summary>
+public partial class CreditCardAccount
 {
     /// <summary>
-    /// Represents the Credit Card Account entity.
+    /// Gets or sets the Min Payment Amount.
     /// </summary>
-    public partial class CreditCardAccount
-    {
-        /// <summary>
-        /// Gets or sets the Min Payment Amount.
-        /// </summary>
-        public decimal MinPaymentAmount { get; set; }
+    public decimal MinPaymentAmount { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Payment Due Amount.
-        /// </summary>
-        public decimal PaymentDueAmount { get; set; }
+    /// <summary>
+    /// Gets or sets the Payment Due Amount.
+    /// </summary>
+    public decimal PaymentDueAmount { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Payment Currency.
-        /// </summary>
-        public string? PaymentCurrency { get; set; }
+    /// <summary>
+    /// Gets or sets the Payment Currency.
+    /// </summary>
+    public string? PaymentCurrency { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Payment Due Date.
-        /// </summary>
-        public DateTime PaymentDueDate { get; set; }
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Gets or sets the Payment Due Date.
+    /// </summary>
+    public DateTime PaymentDueDate { get; set; }
+}
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/MaturityInstructions.cs b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/MaturityInstructions.cs
index 5d2176ae2..541eb5a92 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/MaturityInstructions.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/MaturityInstructions.cs
@@ -2,22 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace Cdr.Banking.Common.Entities;
 
-namespace Cdr.Banking.Common.Entities
-{
-    /// <summary>
-    /// Represents the Maturity Instructions entity.
-    /// </summary>
-    public partial class MaturityInstructions : ReferenceDataBase<Guid> { }
+/// <summary>
+/// Represents the Maturity Instructions entity.
+/// </summary>
+public partial class MaturityInstructions : ReferenceDataBase<Guid> { }
 
-    /// <summary>
-    /// Represents the <c>MaturityInstructions</c> collection.
-    /// </summary>
-    public partial class MaturityInstructionsCollection : List<MaturityInstructions> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the <c>MaturityInstructions</c> collection.
+/// </summary>
+public partial class MaturityInstructionsCollection : List<MaturityInstructions> { }
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/OpenStatus.cs b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/OpenStatus.cs
index d7d4bca2c..6e879c720 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/OpenStatus.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/OpenStatus.cs
@@ -2,22 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace Cdr.Banking.Common.Entities;
 
-namespace Cdr.Banking.Common.Entities
-{
-    /// <summary>
-    /// Represents the Open Status entity.
-    /// </summary>
-    public partial class OpenStatus : ReferenceDataBase<Guid> { }
+/// <summary>
+/// Represents the Open Status entity.
+/// </summary>
+public partial class OpenStatus : ReferenceDataBase<Guid> { }
 
-    /// <summary>
-    /// Represents the <c>OpenStatus</c> collection.
-    /// </summary>
-    public partial class OpenStatusCollection : List<OpenStatus> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the <c>OpenStatus</c> collection.
+/// </summary>
+public partial class OpenStatusCollection : List<OpenStatus> { }
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/ProductCategory.cs b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/ProductCategory.cs
index 755dca441..2eda9271b 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/ProductCategory.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/ProductCategory.cs
@@ -2,22 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace Cdr.Banking.Common.Entities;
 
-namespace Cdr.Banking.Common.Entities
-{
-    /// <summary>
-    /// Represents the Product Category entity.
-    /// </summary>
-    public partial class ProductCategory : ReferenceDataBase<Guid> { }
+/// <summary>
+/// Represents the Product Category entity.
+/// </summary>
+public partial class ProductCategory : ReferenceDataBase<Guid> { }
 
-    /// <summary>
-    /// Represents the <c>ProductCategory</c> collection.
-    /// </summary>
-    public partial class ProductCategoryCollection : List<ProductCategory> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the <c>ProductCategory</c> collection.
+/// </summary>
+public partial class ProductCategoryCollection : List<ProductCategory> { }
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TermDepositAccount.cs b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TermDepositAccount.cs
index a7b68a022..983a441b9 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TermDepositAccount.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TermDepositAccount.cs
@@ -2,42 +2,35 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Cdr.Banking.Common.Entities;
 
-namespace Cdr.Banking.Common.Entities
+/// <summary>
+/// Represents the Term Deposit Account entity.
+/// </summary>
+public partial class TermDepositAccount
 {
     /// <summary>
-    /// Represents the Term Deposit Account entity.
+    /// Gets or sets the Lodgement Date.
     /// </summary>
-    public partial class TermDepositAccount
-    {
-        /// <summary>
-        /// Gets or sets the Lodgement Date.
-        /// </summary>
-        public DateTime LodgementDate { get; set; }
+    public DateTime LodgementDate { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Maturity Date.
-        /// </summary>
-        public DateTime MaturityDate { get; set; }
+    /// <summary>
+    /// Gets or sets the Maturity Date.
+    /// </summary>
+    public DateTime MaturityDate { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Maturity Amount.
-        /// </summary>
-        public decimal MaturityAmount { get; set; }
+    /// <summary>
+    /// Gets or sets the Maturity Amount.
+    /// </summary>
+    public decimal MaturityAmount { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Maturity Currency.
-        /// </summary>
-        public string? MaturityCurrency { get; set; }
+    /// <summary>
+    /// Gets or sets the Maturity Currency.
+    /// </summary>
+    public string? MaturityCurrency { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Maturity Instructions code.
-        /// </summary>
-        public string? MaturityInstructions { get; set; }
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Gets or sets the Maturity Instructions code.
+    /// </summary>
+    public string? MaturityInstructions { get; set; }
+}
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/Transaction.cs b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/Transaction.cs
index a9d826b2b..04deaf297 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/Transaction.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/Transaction.cs
@@ -2,127 +2,120 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Cdr.Banking.Common.Entities;
 
-namespace Cdr.Banking.Common.Entities
+/// <summary>
+/// Represents the Transaction entity.
+/// </summary>
+public partial class Transaction : IIdentifier<string>
 {
     /// <summary>
-    /// Represents the Transaction entity.
-    /// </summary>
-    public partial class Transaction : IIdentifier<string>
-    {
-        /// <summary>
-        /// Gets or sets the <c>Account</c> identifier.
-        /// </summary>
-        [JsonPropertyName("transactionId")]
-        public string? Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Account Id.
-        /// </summary>
-        public string? AccountId { get; set; }
-
-        /// <summary>
-        /// Indicates whether Is Detail Available.
-        /// </summary>
-        public bool IsDetailAvailable { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Type code.
-        /// </summary>
-        public string? Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Status code.
-        /// </summary>
-        public string? Status { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Description.
-        /// </summary>
-        public string? Description { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Posting Date Time.
-        /// </summary>
-        public DateTime PostingDateTime { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Execution Date Time.
-        /// </summary>
-        public DateTime ExecutionDateTime { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Amount.
-        /// </summary>
-        public decimal Amount { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Currency.
-        /// </summary>
-        public string? Currency { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Reference.
-        /// </summary>
-        public string? Reference { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Merchant Name.
-        /// </summary>
-        public string? MerchantName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Merchant Category Code.
-        /// </summary>
-        public string? MerchantCategoryCode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Biller Code.
-        /// </summary>
-        public string? BillerCode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Biller Name.
-        /// </summary>
-        public string? BillerName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Apca Number.
-        /// </summary>
-        public string? ApcaNumber { get; set; }
-    }
-
-    /// <summary>
-    /// Represents the <c>Transaction</c> collection.
-    /// </summary>
-    public partial class TransactionCollection : List<Transaction> { }
-
-    /// <summary>
-    /// Represents the <c>Transaction</c> collection result.
-    /// </summary>
-    public class TransactionCollectionResult : CollectionResult<TransactionCollection, Transaction>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TransactionCollectionResult"/> class.
-        /// </summary>
-        public TransactionCollectionResult() { }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TransactionCollectionResult"/> class with <paramref name="paging"/>.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public TransactionCollectionResult(PagingArgs? paging) : base(paging) { }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TransactionCollectionResult"/> class with <paramref name="items"/> to add.
-        /// </summary>
-        /// <param name="items">The items to add.</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public TransactionCollectionResult(IEnumerable<Transaction> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
-    }
-}
\ No newline at end of file
+    /// Gets or sets the <c>Account</c> identifier.
+    /// </summary>
+    [JsonPropertyName("transactionId")]
+    public string? Id { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Account Id.
+    /// </summary>
+    public string? AccountId { get; set; }
+
+    /// <summary>
+    /// Indicates whether Is Detail Available.
+    /// </summary>
+    public bool IsDetailAvailable { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Type code.
+    /// </summary>
+    public string? Type { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Status code.
+    /// </summary>
+    public string? Status { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Description.
+    /// </summary>
+    public string? Description { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Posting Date Time.
+    /// </summary>
+    public DateTime PostingDateTime { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Execution Date Time.
+    /// </summary>
+    public DateTime ExecutionDateTime { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Amount.
+    /// </summary>
+    public decimal Amount { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Currency.
+    /// </summary>
+    public string? Currency { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Reference.
+    /// </summary>
+    public string? Reference { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Merchant Name.
+    /// </summary>
+    public string? MerchantName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Merchant Category Code.
+    /// </summary>
+    public string? MerchantCategoryCode { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Biller Code.
+    /// </summary>
+    public string? BillerCode { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Biller Name.
+    /// </summary>
+    public string? BillerName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Apca Number.
+    /// </summary>
+    public string? ApcaNumber { get; set; }
+}
+
+/// <summary>
+/// Represents the <c>Transaction</c> collection.
+/// </summary>
+public partial class TransactionCollection : List<Transaction> { }
+
+/// <summary>
+/// Represents the <c>Transaction</c> collection result.
+/// </summary>
+public class TransactionCollectionResult : CollectionResult<TransactionCollection, Transaction>
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TransactionCollectionResult"/> class.
+    /// </summary>
+    public TransactionCollectionResult() { }
+    
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TransactionCollectionResult"/> class with <paramref name="paging"/>.
+    /// </summary>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public TransactionCollectionResult(PagingArgs? paging) : base(paging) { }
+    
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TransactionCollectionResult"/> class with <paramref name="items"/> to add.
+    /// </summary>
+    /// <param name="items">The items to add.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public TransactionCollectionResult(IEnumerable<Transaction> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
+}
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TransactionArgs.cs b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TransactionArgs.cs
index 697bb61b7..6b1332eb8 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TransactionArgs.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TransactionArgs.cs
@@ -2,47 +2,40 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Cdr.Banking.Common.Entities;
 
-namespace Cdr.Banking.Common.Entities
+/// <summary>
+/// Represents the <c>Transaction</c> Arguments entity.
+/// </summary>
+public partial class TransactionArgs
 {
     /// <summary>
-    /// Represents the <c>Transaction</c> Arguments entity.
+    /// Gets or sets the From (oldest time).
     /// </summary>
-    public partial class TransactionArgs
-    {
-        /// <summary>
-        /// Gets or sets the From (oldest time).
-        /// </summary>
-        [JsonPropertyName("oldest-time")]
-        public DateTime? FromDate { get; set; }
+    [JsonPropertyName("oldest-time")]
+    public DateTime? FromDate { get; set; }
 
-        /// <summary>
-        /// Gets or sets the To (newest time).
-        /// </summary>
-        [JsonPropertyName("newest-time")]
-        public DateTime? ToDate { get; set; }
+    /// <summary>
+    /// Gets or sets the To (newest time).
+    /// </summary>
+    [JsonPropertyName("newest-time")]
+    public DateTime? ToDate { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Min Amount.
-        /// </summary>
-        [JsonPropertyName("min-amount")]
-        public decimal? MinAmount { get; set; }
+    /// <summary>
+    /// Gets or sets the Min Amount.
+    /// </summary>
+    [JsonPropertyName("min-amount")]
+    public decimal? MinAmount { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Max Amount.
-        /// </summary>
-        [JsonPropertyName("max-amount")]
-        public decimal? MaxAmount { get; set; }
+    /// <summary>
+    /// Gets or sets the Max Amount.
+    /// </summary>
+    [JsonPropertyName("max-amount")]
+    public decimal? MaxAmount { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Text.
-        /// </summary>
-        [JsonPropertyName("text")]
-        public string? Text { get; set; }
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Gets or sets the Text.
+    /// </summary>
+    [JsonPropertyName("text")]
+    public string? Text { get; set; }
+}
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TransactionStatus.cs b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TransactionStatus.cs
index 4832a473f..b70398058 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TransactionStatus.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TransactionStatus.cs
@@ -2,22 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace Cdr.Banking.Common.Entities;
 
-namespace Cdr.Banking.Common.Entities
-{
-    /// <summary>
-    /// Represents the Transaction Status entity.
-    /// </summary>
-    public partial class TransactionStatus : ReferenceDataBase<Guid> { }
+/// <summary>
+/// Represents the Transaction Status entity.
+/// </summary>
+public partial class TransactionStatus : ReferenceDataBase<Guid> { }
 
-    /// <summary>
-    /// Represents the <c>TransactionStatus</c> collection.
-    /// </summary>
-    public partial class TransactionStatusCollection : List<TransactionStatus> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the <c>TransactionStatus</c> collection.
+/// </summary>
+public partial class TransactionStatusCollection : List<TransactionStatus> { }
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TransactionType.cs b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TransactionType.cs
index 9b13dbe2a..a1aaad6df 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TransactionType.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TransactionType.cs
@@ -2,22 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace Cdr.Banking.Common.Entities;
 
-namespace Cdr.Banking.Common.Entities
-{
-    /// <summary>
-    /// Represents the Transaction Type entity.
-    /// </summary>
-    public partial class TransactionType : ReferenceDataBase<Guid> { }
+/// <summary>
+/// Represents the Transaction Type entity.
+/// </summary>
+public partial class TransactionType : ReferenceDataBase<Guid> { }
 
-    /// <summary>
-    /// Represents the <c>TransactionType</c> collection.
-    /// </summary>
-    public partial class TransactionTypeCollection : List<TransactionType> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the <c>TransactionType</c> collection.
+/// </summary>
+public partial class TransactionTypeCollection : List<TransactionType> { }
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/GlobalUsings.cs b/samples/Cdr.Banking/Cdr.Banking.Common/GlobalUsings.cs
new file mode 100644
index 000000000..ab4cfd039
--- /dev/null
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/GlobalUsings.cs
@@ -0,0 +1,13 @@
+global using CoreEx.Entities;
+global using CoreEx.Http;
+global using CoreEx.Json;
+global using CoreEx.RefData;
+global using System;
+global using System.Collections.Generic;
+global using System.Diagnostics.CodeAnalysis;
+global using System.Text.Json.Serialization;
+global using System.Net.Http;
+global using System.Threading;
+global using System.Threading.Tasks;
+global using Cdr.Banking.Common.Entities;
+global using RefDataNamespace = Cdr.Banking.Common.Entities;
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Business/Data/Model/Generated/Person.cs b/samples/Demo/Beef.Demo.Business/Data/Model/Generated/Person.cs
index 510831c0c..b5ab8052e 100644
--- a/samples/Demo/Beef.Demo.Business/Data/Model/Generated/Person.cs
+++ b/samples/Demo/Beef.Demo.Business/Data/Model/Generated/Person.cs
@@ -5,42 +5,42 @@
 #nullable enable
 #pragma warning disable
 
-namespace Beef.Demo.Business.Data.Model
+namespace Beef.Demo.Business.Data.Model;
+
+/// <summary>
+/// Represents the Person model.
+/// </summary>
+public partial class Person : IPartitionKey
 {
     /// <summary>
-    /// Represents the Person model.
+    /// Gets or sets the User Name.
+    /// </summary>
+    public string? UserName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the First Name.
+    /// </summary>
+    public string? FirstName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Last Name.
     /// </summary>
-    public partial class Person : IPartitionKey
-    {
-        /// <summary>
-        /// Gets or sets the User Name.
-        /// </summary>
-        public string? UserName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the First Name.
-        /// </summary>
-        public string? FirstName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Last Name.
-        /// </summary>
-        public string? LastName { get; set; }
+    public string? LastName { get; set; }
         
-        /// <summary>
-        /// Creates the <see cref="IPartitionKey.PartitionKey"/>.
-        /// </summary>
-        /// <returns>The partition key.</returns>
-        /// <param name="userName">The <see cref="UserName"/>.</param>
-        public static string? CreatePartitionKey(string? userName) => CompositeKey.Create(userName).ToString();
-
-        /// <summary>
-        /// Gets the Partition Key (consists of the following property(s): <see cref="UserName"/>).
-        /// </summary>
-        [JsonIgnore]
-        public string? PartitionKey => CreatePartitionKey(UserName);
-    }
+    /// <summary>
+    /// Creates the <see cref="IPartitionKey.PartitionKey"/>.
+    /// </summary>
+    /// <returns>The partition key.</returns>
+    /// <param name="userName">The <see cref="UserName"/>.</param>
+    public static string? CreatePartitionKey(string? userName) => CompositeKey.Create(userName).ToString();
+
+    /// <summary>
+    /// Gets the Partition Key (consists of the following property(s): <see cref="UserName"/>).
+    /// </summary>
+    [JsonIgnore]
+    public string? PartitionKey => CreatePartitionKey(UserName);
 }
 
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Business/Data/Model/Generated/PlaceInfo.cs b/samples/Demo/Beef.Demo.Business/Data/Model/Generated/PlaceInfo.cs
index 9aa67ed3b..fde64a290 100644
--- a/samples/Demo/Beef.Demo.Business/Data/Model/Generated/PlaceInfo.cs
+++ b/samples/Demo/Beef.Demo.Business/Data/Model/Generated/PlaceInfo.cs
@@ -5,31 +5,31 @@
 #nullable enable
 #pragma warning disable
 
-namespace Beef.Demo.Business.Data.Model
+namespace Beef.Demo.Business.Data.Model;
+
+/// <summary>
+/// Represents the Place Info model.
+/// </summary>
+public partial class PlaceInfo
 {
     /// <summary>
-    /// Represents the Place Info model.
+    /// Gets or sets the Name.
     /// </summary>
-    public partial class PlaceInfo
-    {
-        /// <summary>
-        /// Gets or sets the Name.
-        /// </summary>
-        [JsonPropertyName("place name")]
-        public string? Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Post Code.
-        /// </summary>
-        [JsonPropertyName("post code")]
-        public string? PostCode { get; set; }
-    }
+    [JsonPropertyName("place name")]
+    public string? Name { get; set; }
 
     /// <summary>
-    /// Represents the <see cref="PlaceInfo"/> collection.
+    /// Gets or sets the Post Code.
     /// </summary>
-    public partial class PlaceInfoCollection : List<PlaceInfo> { }
+    [JsonPropertyName("post code")]
+    public string? PostCode { get; set; }
 }
 
+/// <summary>
+/// Represents the <see cref="PlaceInfo"/> collection.
+/// </summary>
+public partial class PlaceInfoCollection : List<PlaceInfo> { }
+
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Business/Data/Model/Generated/PostalInfo.cs b/samples/Demo/Beef.Demo.Business/Data/Model/Generated/PostalInfo.cs
index 01defe7bb..7ab740e66 100644
--- a/samples/Demo/Beef.Demo.Business/Data/Model/Generated/PostalInfo.cs
+++ b/samples/Demo/Beef.Demo.Business/Data/Model/Generated/PostalInfo.cs
@@ -5,43 +5,43 @@
 #nullable enable
 #pragma warning disable
 
-namespace Beef.Demo.Business.Data.Model
+namespace Beef.Demo.Business.Data.Model;
+
+/// <summary>
+/// Represents the Postal Info model.
+/// </summary>
+public partial class PostalInfo : IETag
 {
     /// <summary>
-    /// Represents the Postal Info model.
+    /// Gets or sets the Country code.
+    /// </summary>
+    [JsonPropertyName("country abbreviation")]
+    public string? Country { get; set; }
+
+    /// <summary>
+    /// Gets or sets the City.
+    /// </summary>
+    [JsonPropertyName("place name")]
+    public string? City { get; set; }
+
+    /// <summary>
+    /// Gets or sets the State.
     /// </summary>
-    public partial class PostalInfo : IETag
-    {
-        /// <summary>
-        /// Gets or sets the Country code.
-        /// </summary>
-        [JsonPropertyName("country abbreviation")]
-        public string? Country { get; set; }
-
-        /// <summary>
-        /// Gets or sets the City.
-        /// </summary>
-        [JsonPropertyName("place name")]
-        public string? City { get; set; }
-
-        /// <summary>
-        /// Gets or sets the State.
-        /// </summary>
-        [JsonPropertyName("state abbreviation")]
-        public string? State { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Places.
-        /// </summary>
-        public PlaceInfoCollection? Places { get; set; }
-
-        /// <summary>
-        /// Gets or sets the ETag.
-        /// </summary>
-        [JsonIgnore]
-        public string? ETag { get; set; }
-    }
+    [JsonPropertyName("state abbreviation")]
+    public string? State { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Places.
+    /// </summary>
+    public PlaceInfoCollection? Places { get; set; }
+
+    /// <summary>
+    /// Gets or sets the ETag.
+    /// </summary>
+    [JsonIgnore]
+    public string? ETag { get; set; }
 }
 
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Business/Data/Model/Generated/PowerSource.cs b/samples/Demo/Beef.Demo.Business/Data/Model/Generated/PowerSource.cs
index 205126a6a..b09953254 100644
--- a/samples/Demo/Beef.Demo.Business/Data/Model/Generated/PowerSource.cs
+++ b/samples/Demo/Beef.Demo.Business/Data/Model/Generated/PowerSource.cs
@@ -5,24 +5,24 @@
 #nullable enable
 #pragma warning disable
 
-namespace Beef.Demo.Business.Data.Model
-{
-    /// <summary>
-    /// Represents the Power Source model.
-    /// </summary>
-    public partial class PowerSource : ReferenceDataBase<Guid>
-    {
-        /// <summary>
-        /// Gets or sets the Additional Info.
-        /// </summary>
-        public string? AdditionalInfo { get; set; }
-    }
+namespace Beef.Demo.Business.Data.Model;
 
+/// <summary>
+/// Represents the Power Source model.
+/// </summary>
+public partial class PowerSource : ReferenceDataBase<Guid>
+{
     /// <summary>
-    /// Represents the <see cref="PowerSource"/> collection.
+    /// Gets or sets the Additional Info.
     /// </summary>
-    public partial class PowerSourceCollection : List<PowerSource> { }
+    public string? AdditionalInfo { get; set; }
 }
 
+/// <summary>
+/// Represents the <see cref="PowerSource"/> collection.
+/// </summary>
+public partial class PowerSourceCollection : List<PowerSource> { }
+
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Business/Data/Model/Generated/Product.cs b/samples/Demo/Beef.Demo.Business/Data/Model/Generated/Product.cs
index 8ebb7422e..65101d132 100644
--- a/samples/Demo/Beef.Demo.Business/Data/Model/Generated/Product.cs
+++ b/samples/Demo/Beef.Demo.Business/Data/Model/Generated/Product.cs
@@ -5,29 +5,29 @@
 #nullable enable
 #pragma warning disable
 
-namespace Beef.Demo.Business.Data.Model
+namespace Beef.Demo.Business.Data.Model;
+
+/// <summary>
+/// Represents the Product model.
+/// </summary>
+public partial class Product
 {
     /// <summary>
-    /// Represents the Product model.
+    /// Gets or sets the ID.
     /// </summary>
-    public partial class Product
-    {
-        /// <summary>
-        /// Gets or sets the ID.
-        /// </summary>
-        public int ID { get; set; }
+    public int ID { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Name.
-        /// </summary>
-        public string? Name { get; set; }
+    /// <summary>
+    /// Gets or sets the Name.
+    /// </summary>
+    public string? Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Description.
-        /// </summary>
-        public string? Description { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the Description.
+    /// </summary>
+    public string? Description { get; set; }
 }
 
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Business/Data/Model/Generated/RefDataPrimaryKey.cs b/samples/Demo/Beef.Demo.Business/Data/Model/Generated/RefDataPrimaryKey.cs
index 7472b8058..70faa6007 100644
--- a/samples/Demo/Beef.Demo.Business/Data/Model/Generated/RefDataPrimaryKey.cs
+++ b/samples/Demo/Beef.Demo.Business/Data/Model/Generated/RefDataPrimaryKey.cs
@@ -5,37 +5,37 @@
 #nullable enable
 #pragma warning disable
 
-namespace Beef.Demo.Business.Data.Model
+namespace Beef.Demo.Business.Data.Model;
+
+/// <summary>
+/// Represents the Ref Data Primary Key model.
+/// </summary>
+public partial class RefDataPrimaryKey : IPrimaryKey
 {
     /// <summary>
-    /// Represents the Ref Data Primary Key model.
+    /// Gets or sets the Key1 code.
     /// </summary>
-    public partial class RefDataPrimaryKey : IPrimaryKey
-    {
-        /// <summary>
-        /// Gets or sets the Key1 code.
-        /// </summary>
-        public string? Key1 { get; set; }
+    public string? Key1 { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Other.
-        /// </summary>
-        public string? Other { get; set; }
+    /// <summary>
+    /// Gets or sets the Other.
+    /// </summary>
+    public string? Other { get; set; }
         
-        /// <summary>
-        /// Creates the primary <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <returns>The primary <see cref="CompositeKey"/>.</returns>
-        /// <param name="key1">The <see cref="Key1"/>.</param>
+    /// <summary>
+    /// Creates the primary <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <returns>The primary <see cref="CompositeKey"/>.</returns>
+    /// <param name="key1">The <see cref="Key1"/>.</param>
         public static CompositeKey CreatePrimaryKey(string? key1) => CompositeKey.Create(key1);
 
-        /// <summary>
-        /// Gets the primary <see cref="CompositeKey"/> (consists of the following property(s): <see cref="Key1"/>).
-        /// </summary>
-        [JsonIgnore]
-        public CompositeKey PrimaryKey => CreatePrimaryKey(Key1);
-    }
+    /// <summary>
+    /// Gets the primary <see cref="CompositeKey"/> (consists of the following property(s): <see cref="Key1"/>).
+    /// </summary>
+    [JsonIgnore]
+    public CompositeKey PrimaryKey => CreatePrimaryKey(Key1);
 }
 
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Business/Data/Model/Generated/Robot.cs b/samples/Demo/Beef.Demo.Business/Data/Model/Generated/Robot.cs
index b14506d33..09e007882 100644
--- a/samples/Demo/Beef.Demo.Business/Data/Model/Generated/Robot.cs
+++ b/samples/Demo/Beef.Demo.Business/Data/Model/Generated/Robot.cs
@@ -5,56 +5,56 @@
 #nullable enable
 #pragma warning disable
 
-namespace Beef.Demo.Business.Data.Model
+namespace Beef.Demo.Business.Data.Model;
+
+/// <summary>
+/// Represents the Robot model.
+/// </summary>
+public partial class Robot : IIdentifier<string>, IETag, IChangeLog
 {
     /// <summary>
-    /// Represents the Robot model.
+    /// Gets or sets the identifier.
+    /// </summary>
+    public string? Id { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Model No.
+    /// </summary>
+    public string? ModelNo { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Serial No.
+    /// </summary>
+    public string? SerialNo { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Eye Color.
     /// </summary>
-    public partial class Robot : IIdentifier<string>, IETag, IChangeLog
-    {
-        /// <summary>
-        /// Gets or sets the identifier.
-        /// </summary>
-        public string? Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Model No.
-        /// </summary>
-        public string? ModelNo { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Serial No.
-        /// </summary>
-        public string? SerialNo { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Eye Color.
-        /// </summary>
-        public string? EyeColor { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Power Source.
-        /// </summary>
-        public string? PowerSource { get; set; }
-
-        /// <summary>
-        /// Gets or sets the ETag.
-        /// </summary>
-        [Newtonsoft.Json.JsonProperty("_etag")]
-        [JsonPropertyName("_etag")]
-        public string? ETag { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Change Log.
-        /// </summary>
-        public ChangeLog? ChangeLog { get; set; }
-    }
+    public string? EyeColor { get; set; }
 
     /// <summary>
-    /// Represents the <see cref="Robot"/> collection.
+    /// Gets or sets the Power Source.
     /// </summary>
-    public partial class RobotCollection : List<Robot> { }
+    public string? PowerSource { get; set; }
+
+    /// <summary>
+    /// Gets or sets the ETag.
+    /// </summary>
+    [Newtonsoft.Json.JsonProperty("_etag")]
+    [JsonPropertyName("_etag")]
+    public string? ETag { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Change Log.
+    /// </summary>
+    public ChangeLog? ChangeLog { get; set; }
 }
 
+/// <summary>
+/// Represents the <see cref="Robot"/> collection.
+/// </summary>
+public partial class RobotCollection : List<Robot> { }
+
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Business/Entities/Generated/PersonOther.cs b/samples/Demo/Beef.Demo.Business/Entities/Generated/PersonOther.cs
index fe2fd06d4..77539d11b 100644
--- a/samples/Demo/Beef.Demo.Business/Entities/Generated/PersonOther.cs
+++ b/samples/Demo/Beef.Demo.Business/Entities/Generated/PersonOther.cs
@@ -5,51 +5,45 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Beef.Demo.Business.Entities;
 
-namespace Beef.Demo.Business.Entities
+/// <summary>
+/// Represents the other <see cref="Person"/> without <see cref="EntityBase"/> capabilities entity.
+/// </summary>
+public partial class PersonOther : IIdentifier<Guid>, IETag, IChangeLog
 {
     /// <summary>
-    /// Represents the other <see cref="Person"/> without <see cref="EntityBase"/> capabilities entity.
+    /// Gets or sets the <see cref="Person"/> identifier.
     /// </summary>
-    public partial class PersonOther : IIdentifier<Guid>, IETag, IChangeLog
-    {
-        /// <summary>
-        /// Gets or sets the <see cref="Person"/> identifier.
-        /// </summary>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the First Name.
-        /// </summary>
-        public string? FirstName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Last Name.
-        /// </summary>
-        public string? LastName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the ETag.
-        /// </summary>
-        [JsonPropertyName("etag")]
-        public string? ETag { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Change Log.
-        /// </summary>
-        public ChangeLog? ChangeLog { get; set; }
-    }
+    public Guid Id { get; set; }
 
     /// <summary>
-    /// Represents the <see cref="PersonOther"/> collection.
+    /// Gets or sets the First Name.
     /// </summary>
-    public partial class PersonOtherCollection : List<PersonOther> { }
+    public string? FirstName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Last Name.
+    /// </summary>
+    public string? LastName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the ETag.
+    /// </summary>
+    [JsonPropertyName("etag")]
+    public string? ETag { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Change Log.
+    /// </summary>
+    public ChangeLog? ChangeLog { get; set; }
 }
 
+/// <summary>
+/// Represents the <see cref="PersonOther"/> collection.
+/// </summary>
+public partial class PersonOtherCollection : List<PersonOther> { }
+
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Agents/Generated/ConfigAgent.cs b/samples/Demo/Beef.Demo.Common/Agents/Generated/ConfigAgent.cs
index 52a64fc2b..d8b4ae2cc 100644
--- a/samples/Demo/Beef.Demo.Common/Agents/Generated/ConfigAgent.cs
+++ b/samples/Demo/Beef.Demo.Common/Agents/Generated/ConfigAgent.cs
@@ -5,36 +5,24 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using Beef.Demo.Common.Entities;
-using RefDataNamespace = Beef.Demo.Common.Entities;
+namespace Beef.Demo.Common.Agents;
 
-namespace Beef.Demo.Common.Agents
+/// <summary>
+/// Provides the <b>Config</b> HTTP agent.
+/// </summary>
+public partial class ConfigAgent : TypedHttpClientBase<ConfigAgent>, IConfigAgent
 {
     /// <summary>
-    /// Provides the <b>Config</b> HTTP agent.
+    /// Initializes a new instance of the <see cref="ConfigAgent"/> class.
     /// </summary>
-    public partial class ConfigAgent : TypedHttpClientBase<ConfigAgent>, IConfigAgent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConfigAgent"/> class.
-        /// </summary>
-        /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
-        /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
-        public ConfigAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
+    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
+    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
+    /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
+    public ConfigAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
 
-        /// <inheritdoc/>
-        public Task<HttpResult<System.Collections.IDictionary>> GetEnvVarsAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync<System.Collections.IDictionary>("api/v1/envvars", requestOptions: requestOptions, cancellationToken: cancellationToken);
-    }
+    /// <inheritdoc/>
+    public Task<HttpResult<System.Collections.IDictionary>> GetEnvVarsAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync<System.Collections.IDictionary>("api/v1/envvars", requestOptions: requestOptions, cancellationToken: cancellationToken);
 }
 
 #pragma warning restore
diff --git a/samples/Demo/Beef.Demo.Common/Agents/Generated/ContactAgent.cs b/samples/Demo/Beef.Demo.Common/Agents/Generated/ContactAgent.cs
index 5ce2ff699..092d2b951 100644
--- a/samples/Demo/Beef.Demo.Common/Agents/Generated/ContactAgent.cs
+++ b/samples/Demo/Beef.Demo.Common/Agents/Generated/ContactAgent.cs
@@ -5,64 +5,52 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using Beef.Demo.Common.Entities;
-using RefDataNamespace = Beef.Demo.Common.Entities;
+namespace Beef.Demo.Common.Agents;
 
-namespace Beef.Demo.Common.Agents
+/// <summary>
+/// Provides the <see cref="Contact"/> HTTP agent.
+/// </summary>
+public partial class ContactAgent : TypedHttpClientBase<ContactAgent>, IContactAgent
 {
     /// <summary>
-    /// Provides the <see cref="Contact"/> HTTP agent.
+    /// Initializes a new instance of the <see cref="ContactAgent"/> class.
     /// </summary>
-    public partial class ContactAgent : TypedHttpClientBase<ContactAgent>, IContactAgent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ContactAgent"/> class.
-        /// </summary>
-        /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
-        /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
-        public ContactAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
-
-        /// <inheritdoc/>
-        public Task<HttpResult<ContactCollectionResult>> GetByQueryAsync(QueryArgs? query = null, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<ContactCollectionResult>("api/v1/contacts/query", requestOptions: requestOptions.IncludeQuery(query).IncludePaging(paging), args: HttpArgs.Create(), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<ContactCollectionResult>> GetAllAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<ContactCollectionResult>("api/v1/contacts", requestOptions: requestOptions, cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Contact?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<Contact?>("api/v1/contacts/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Contact>> CreateAsync(Contact value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync<Contact, Contact>("api/v1/contacts", value, requestOptions: requestOptions, cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Contact>> UpdateAsync(Contact value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PutAsync<Contact, Contact>("api/v1/contacts/{id}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Contact>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PatchAsync<Contact>("api/v1/contacts/{id}", patchOption, value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => DeleteAsync("api/v1/contacts/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult> RaiseEventAsync(bool throwError, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync("api/v1/contacts/raise", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<bool>("throwError", throwError)), cancellationToken: cancellationToken);
-    }
+    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
+    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
+    /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
+    public ContactAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
+
+    /// <inheritdoc/>
+    public Task<HttpResult<ContactCollectionResult>> GetByQueryAsync(QueryArgs? query = null, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<ContactCollectionResult>("api/v1/contacts/query", requestOptions: requestOptions.IncludeQuery(query).IncludePaging(paging), args: HttpArgs.Create(), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<ContactCollectionResult>> GetAllAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<ContactCollectionResult>("api/v1/contacts", requestOptions: requestOptions, cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Contact?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<Contact?>("api/v1/contacts/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Contact>> CreateAsync(Contact value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync<Contact, Contact>("api/v1/contacts", value, requestOptions: requestOptions, cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Contact>> UpdateAsync(Contact value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PutAsync<Contact, Contact>("api/v1/contacts/{id}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Contact>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PatchAsync<Contact>("api/v1/contacts/{id}", patchOption, value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => DeleteAsync("api/v1/contacts/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult> RaiseEventAsync(bool throwError, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync("api/v1/contacts/raise", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<bool>("throwError", throwError)), cancellationToken: cancellationToken);
 }
 
 #pragma warning restore
diff --git a/samples/Demo/Beef.Demo.Common/Agents/Generated/GenderAgent.cs b/samples/Demo/Beef.Demo.Common/Agents/Generated/GenderAgent.cs
index 771b213d3..7765782c2 100644
--- a/samples/Demo/Beef.Demo.Common/Agents/Generated/GenderAgent.cs
+++ b/samples/Demo/Beef.Demo.Common/Agents/Generated/GenderAgent.cs
@@ -5,44 +5,32 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using Beef.Demo.Common.Entities;
-using RefDataNamespace = Beef.Demo.Common.Entities;
+namespace Beef.Demo.Common.Agents;
 
-namespace Beef.Demo.Common.Agents
+/// <summary>
+/// Provides the <see cref="Gender"/> HTTP agent.
+/// </summary>
+public partial class GenderAgent : TypedHttpClientBase<GenderAgent>, IGenderAgent
 {
     /// <summary>
-    /// Provides the <see cref="Gender"/> HTTP agent.
+    /// Initializes a new instance of the <see cref="GenderAgent"/> class.
     /// </summary>
-    public partial class GenderAgent : TypedHttpClientBase<GenderAgent>, IGenderAgent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GenderAgent"/> class.
-        /// </summary>
-        /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
-        /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
-        public GenderAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
+    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
+    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
+    /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
+    public GenderAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
 
-        /// <inheritdoc/>
-        public Task<HttpResult<Gender?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<Gender?>("api/v1/demo/ref/genders/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+    /// <inheritdoc/>
+    public Task<HttpResult<Gender?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<Gender?>("api/v1/demo/ref/genders/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
 
-        /// <inheritdoc/>
-        public Task<HttpResult<Gender>> CreateAsync(Gender value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync<Gender, Gender>("api/v1/demo/ref/genders", value, requestOptions: requestOptions, cancellationToken: cancellationToken);
+    /// <inheritdoc/>
+    public Task<HttpResult<Gender>> CreateAsync(Gender value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync<Gender, Gender>("api/v1/demo/ref/genders", value, requestOptions: requestOptions, cancellationToken: cancellationToken);
 
-        /// <inheritdoc/>
-        public Task<HttpResult<Gender>> UpdateAsync(Gender value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PutAsync<Gender, Gender>("api/v1/demo/ref/genders/{id}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-    }
+    /// <inheritdoc/>
+    public Task<HttpResult<Gender>> UpdateAsync(Gender value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PutAsync<Gender, Gender>("api/v1/demo/ref/genders/{id}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
 }
 
 #pragma warning restore
diff --git a/samples/Demo/Beef.Demo.Common/Agents/Generated/IConfigAgent.cs b/samples/Demo/Beef.Demo.Common/Agents/Generated/IConfigAgent.cs
index d39b2b020..d8fce8579 100644
--- a/samples/Demo/Beef.Demo.Common/Agents/Generated/IConfigAgent.cs
+++ b/samples/Demo/Beef.Demo.Common/Agents/Generated/IConfigAgent.cs
@@ -5,34 +5,20 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using Microsoft.Extensions.Logging;
-using Beef.Demo.Common.Entities;
-using RefDataNamespace = Beef.Demo.Common.Entities;
+namespace Beef.Demo.Common.Agents;
 
-namespace Beef.Demo.Common.Agents
+/// <summary>
+/// Defines the <b>Config</b> HTTP agent.
+/// </summary>
+public partial interface IConfigAgent
 {
     /// <summary>
-    /// Defines the <b>Config</b> HTTP agent.
+    /// Get Env Vars.
     /// </summary>
-    public partial interface IConfigAgent
-    {
-        /// <summary>
-        /// Get Env Vars.
-        /// </summary>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<System.Collections.IDictionary>> GetEnvVarsAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-    }
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<System.Collections.IDictionary>> GetEnvVarsAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 }
 
 #pragma warning restore
diff --git a/samples/Demo/Beef.Demo.Common/Agents/Generated/IContactAgent.cs b/samples/Demo/Beef.Demo.Common/Agents/Generated/IContactAgent.cs
index 43554e83b..cf661b7cd 100644
--- a/samples/Demo/Beef.Demo.Common/Agents/Generated/IContactAgent.cs
+++ b/samples/Demo/Beef.Demo.Common/Agents/Generated/IContactAgent.cs
@@ -5,101 +5,87 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using Microsoft.Extensions.Logging;
-using Beef.Demo.Common.Entities;
-using RefDataNamespace = Beef.Demo.Common.Entities;
+namespace Beef.Demo.Common.Agents;
 
-namespace Beef.Demo.Common.Agents
+/// <summary>
+/// Defines the <see cref="Contact"/> HTTP agent.
+/// </summary>
+public partial interface IContactAgent
 {
     /// <summary>
-    /// Defines the <see cref="Contact"/> HTTP agent.
+    /// Gets the <see cref="ContactCollectionResult"/> that contains the items that match the selection criteria.
     /// </summary>
-    public partial interface IContactAgent
-    {
-        /// <summary>
-        /// Gets the <see cref="ContactCollectionResult"/> that contains the items that match the selection criteria.
-        /// </summary>
-        /// <param name="query">The <see cref="QueryArgs"/>.</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<ContactCollectionResult>> GetByQueryAsync(QueryArgs? query = null, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <param name="query">The <see cref="QueryArgs"/>.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<ContactCollectionResult>> GetByQueryAsync(QueryArgs? query = null, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets the <see cref="ContactCollectionResult"/> that contains the items that match the selection criteria.
-        /// </summary>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<ContactCollectionResult>> GetAllAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets the <see cref="ContactCollectionResult"/> that contains the items that match the selection criteria.
+    /// </summary>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<ContactCollectionResult>> GetAllAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets the specified <see cref="Contact"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="Contact"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Contact?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets the specified <see cref="Contact"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="Contact"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Contact?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Creates a new <see cref="Contact"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="Contact"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Contact>> CreateAsync(Contact value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Creates a new <see cref="Contact"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="Contact"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Contact>> CreateAsync(Contact value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Updates an existing <see cref="Contact"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="Contact"/>.</param>
-        /// <param name="id">The <see cref="Contact"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Contact>> UpdateAsync(Contact value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Updates an existing <see cref="Contact"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="Contact"/>.</param>
+    /// <param name="id">The <see cref="Contact"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Contact>> UpdateAsync(Contact value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Patches an existing <see cref="Contact"/>.
-        /// </summary>
-        /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
-        /// <param name="value">The <see cref="string"/> that contains the patch content for the <see cref="Contact"/>.</param>
-        /// <param name="id">The <see cref="Contact"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Contact>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Patches an existing <see cref="Contact"/>.
+    /// </summary>
+    /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
+    /// <param name="value">The <see cref="string"/> that contains the patch content for the <see cref="Contact"/>.</param>
+    /// <param name="id">The <see cref="Contact"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Contact>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Deletes the specified <see cref="Contact"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="Contact"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Deletes the specified <see cref="Contact"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="Contact"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Raise Event.
-        /// </summary>
-        /// <param name="throwError">Indicates whether throw a DivideByZero exception.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult> RaiseEventAsync(bool throwError, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-    }
+    /// <summary>
+    /// Raise Event.
+    /// </summary>
+    /// <param name="throwError">Indicates whether throw a DivideByZero exception.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult> RaiseEventAsync(bool throwError, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 }
 
 #pragma warning restore
diff --git a/samples/Demo/Beef.Demo.Common/Agents/Generated/IGenderAgent.cs b/samples/Demo/Beef.Demo.Common/Agents/Generated/IGenderAgent.cs
index c045030d7..474c96644 100644
--- a/samples/Demo/Beef.Demo.Common/Agents/Generated/IGenderAgent.cs
+++ b/samples/Demo/Beef.Demo.Common/Agents/Generated/IGenderAgent.cs
@@ -5,54 +5,40 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using Microsoft.Extensions.Logging;
-using Beef.Demo.Common.Entities;
-using RefDataNamespace = Beef.Demo.Common.Entities;
+namespace Beef.Demo.Common.Agents;
 
-namespace Beef.Demo.Common.Agents
+/// <summary>
+/// Defines the <see cref="Gender"/> HTTP agent.
+/// </summary>
+public partial interface IGenderAgent
 {
     /// <summary>
-    /// Defines the <see cref="Gender"/> HTTP agent.
+    /// Gets the specified <see cref="Gender"/>.
     /// </summary>
-    public partial interface IGenderAgent
-    {
-        /// <summary>
-        /// Gets the specified <see cref="Gender"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="Gender"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Gender?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <param name="id">The <see cref="Gender"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Gender?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Creates a new <see cref="Gender"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="Gender"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Gender>> CreateAsync(Gender value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Creates a new <see cref="Gender"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="Gender"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Gender>> CreateAsync(Gender value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Updates an existing <see cref="Gender"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="Gender"/>.</param>
-        /// <param name="id">The <see cref="Gender"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Gender>> UpdateAsync(Gender value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-    }
+    /// <summary>
+    /// Updates an existing <see cref="Gender"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="Gender"/>.</param>
+    /// <param name="id">The <see cref="Gender"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Gender>> UpdateAsync(Gender value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 }
 
 #pragma warning restore
diff --git a/samples/Demo/Beef.Demo.Common/Agents/Generated/IPersonAgent.cs b/samples/Demo/Beef.Demo.Common/Agents/Generated/IPersonAgent.cs
index 4949159ff..a782c9b84 100644
--- a/samples/Demo/Beef.Demo.Common/Agents/Generated/IPersonAgent.cs
+++ b/samples/Demo/Beef.Demo.Common/Agents/Generated/IPersonAgent.cs
@@ -5,360 +5,346 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using Microsoft.Extensions.Logging;
-using Beef.Demo.Common.Entities;
-using RefDataNamespace = Beef.Demo.Common.Entities;
-
-namespace Beef.Demo.Common.Agents
+namespace Beef.Demo.Common.Agents;
+
+/// <summary>
+/// Defines the <see cref="Person"/> HTTP agent.
+/// </summary>
+public partial interface IPersonAgent
 {
     /// <summary>
-    /// Defines the <see cref="Person"/> HTTP agent.
-    /// </summary>
-    public partial interface IPersonAgent
-    {
-        /// <summary>
-        /// Creates a new <see cref="Person"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="Person"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Person>> CreateAsync(Person value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Deletes the specified <see cref="Person"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="Person"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Gets the specified <see cref="Person"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="Person"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Person?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Gets the specified <see cref="Person"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="Person"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Person?>> GetExAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Updates an existing <see cref="Person"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="Person"/>.</param>
-        /// <param name="id">The <see cref="Person"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Person>> UpdateAsync(Person value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Updates an existing <see cref="Person"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="Person"/>.</param>
-        /// <param name="id">The <see cref="Person"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Person>> UpdateWithRollbackAsync(Person value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Patches an existing <see cref="Person"/>.
-        /// </summary>
-        /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
-        /// <param name="value">The <see cref="string"/> that contains the patch content for the <see cref="Person"/>.</param>
-        /// <param name="id">The <see cref="Person"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Person>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Gets the <see cref="PersonCollectionResult"/> that contains the items that match the selection criteria.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PersonCollectionResult>> GetAllAsync(PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Gets the <see cref="PersonCollectionResult"/> that contains the items that match the selection criteria.
-        /// </summary>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PersonCollectionResult>> GetAll2Async(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Gets the <see cref="PersonCollectionResult"/> that contains the items that match the selection criteria.
-        /// </summary>
-        /// <param name="args">The Args (see <see cref="PersonArgs"/>).</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PersonCollectionResult>> GetByArgsAsync(PersonArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Gets the <see cref="PersonDetailCollectionResult"/> that contains the items that match the selection criteria.
-        /// </summary>
-        /// <param name="args">The Args (see <see cref="PersonArgs"/>).</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PersonDetailCollectionResult>> GetDetailByArgsAsync(PersonArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Merge first <see cref="Person"/> into second.
-        /// </summary>
-        /// <param name="fromId">The from <see cref="Person"/> identifier.</param>
-        /// <param name="toId">The to <see cref="Person"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Person>> MergeAsync(Guid fromId, Guid toId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Mark <see cref="Person"/>.
-        /// </summary>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult> MarkAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Get <see cref="Person"/> at specified <see cref="MapCoordinates"/>.
-        /// </summary>
-        /// <param name="args">The Args (see <see cref="MapArgs"/>).</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<MapCoordinates>> MapAsync(MapArgs? args, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Get no arguments.
-        /// </summary>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Person?>> GetNoArgsAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Gets the specified <see cref="PersonDetail"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="Person"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PersonDetail?>> GetDetailAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Updates an existing <see cref="PersonDetail"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="PersonDetail"/>.</param>
-        /// <param name="id">The <see cref="Person"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PersonDetail>> UpdateDetailAsync(PersonDetail value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Patches an existing <see cref="PersonDetail"/>.
-        /// </summary>
-        /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
-        /// <param name="value">The <see cref="string"/> that contains the patch content for the <see cref="PersonDetail"/>.</param>
-        /// <param name="id">The <see cref="Person"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PersonDetail>> PatchDetailAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Actually validating the FromBody parameter generation.
-        /// </summary>
-        /// <param name="person">The Person (see <see cref="Person"/>).</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult> AddAsync(Person person, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Actually validating the AcceptBody parameter generation.
-        /// </summary>
-        /// <param name="person">The Person (see <see cref="Person"/>).</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult> Add2Async(Person person, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Actually validating the Custom with Value parameter generation.
-        /// </summary>
-        /// <param name="value">The <see cref="Person"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult> Add3Async(Person value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Validate CustomManagerOnly.
-        /// </summary>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult> CustomManagerOnlyAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Get Null.
-        /// </summary>
-        /// <param name="name">The Name.</param>
-        /// <param name="names">The Names.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Person?>> GetNullAsync(string? name, List<string>? names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Validate when an Event is published but not sent.
-        /// </summary>
-        /// <param name="value">The <see cref="Person"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Person>> EventPublishNoSendAsync(Person value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Gets the <see cref="PersonCollectionResult"/> that contains the items that match the selection criteria.
-        /// </summary>
-        /// <param name="args">The Args (see <see cref="PersonArgs"/>).</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PersonCollectionResult>> GetByArgsWithEfAsync(PersonArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Throw Error.
-        /// </summary>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult> ThrowErrorAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Invoke Api Via Agent.
-        /// </summary>
-        /// <param name="id">The <see cref="Person"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<string>> InvokeApiViaAgentAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Param Coll.
-        /// </summary>
-        /// <param name="addresses">The Addresses.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult> ParamCollAsync(AddressCollection? addresses, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Gets the specified <see cref="Person"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="Person"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Person?>> GetWithEfAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Creates a new <see cref="Person"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="Person"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Person>> CreateWithEfAsync(Person value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Updates an existing <see cref="Person"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="Person"/>.</param>
-        /// <param name="id">The <see cref="Person"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Person>> UpdateWithEfAsync(Person value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Deletes the specified <see cref="Person"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="Person"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult> DeleteWithEfAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Patches an existing <see cref="Person"/>.
-        /// </summary>
-        /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
-        /// <param name="value">The <see cref="string"/> that contains the patch content for the <see cref="Person"/>.</param>
-        /// <param name="id">The <see cref="Person"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Person>> PatchWithEfAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Get Documentation.
-        /// </summary>
-        /// <param name="id">The <see cref="Person"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult> GetDocumentationAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Simulate Work.
-        /// </summary>
-        /// <param name="id">The <see cref="Person"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<string?>> SimulateWorkAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Extend Response.
-        /// </summary>
-        /// <param name="name">The Name.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<string?>> ExtendResponseAsync(string? name, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-    }
+    /// Creates a new <see cref="Person"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="Person"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Person>> CreateAsync(Person value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Deletes the specified <see cref="Person"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="Person"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Gets the specified <see cref="Person"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="Person"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Person?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Gets the specified <see cref="Person"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="Person"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Person?>> GetExAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Updates an existing <see cref="Person"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="Person"/>.</param>
+    /// <param name="id">The <see cref="Person"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Person>> UpdateAsync(Person value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Updates an existing <see cref="Person"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="Person"/>.</param>
+    /// <param name="id">The <see cref="Person"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Person>> UpdateWithRollbackAsync(Person value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Patches an existing <see cref="Person"/>.
+    /// </summary>
+    /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
+    /// <param name="value">The <see cref="string"/> that contains the patch content for the <see cref="Person"/>.</param>
+    /// <param name="id">The <see cref="Person"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Person>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Gets the <see cref="PersonCollectionResult"/> that contains the items that match the selection criteria.
+    /// </summary>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PersonCollectionResult>> GetAllAsync(PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Gets the <see cref="PersonCollectionResult"/> that contains the items that match the selection criteria.
+    /// </summary>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PersonCollectionResult>> GetAll2Async(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Gets the <see cref="PersonCollectionResult"/> that contains the items that match the selection criteria.
+    /// </summary>
+    /// <param name="args">The Args (see <see cref="PersonArgs"/>).</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PersonCollectionResult>> GetByArgsAsync(PersonArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Gets the <see cref="PersonDetailCollectionResult"/> that contains the items that match the selection criteria.
+    /// </summary>
+    /// <param name="args">The Args (see <see cref="PersonArgs"/>).</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PersonDetailCollectionResult>> GetDetailByArgsAsync(PersonArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Merge first <see cref="Person"/> into second.
+    /// </summary>
+    /// <param name="fromId">The from <see cref="Person"/> identifier.</param>
+    /// <param name="toId">The to <see cref="Person"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Person>> MergeAsync(Guid fromId, Guid toId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Mark <see cref="Person"/>.
+    /// </summary>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult> MarkAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Get <see cref="Person"/> at specified <see cref="MapCoordinates"/>.
+    /// </summary>
+    /// <param name="args">The Args (see <see cref="MapArgs"/>).</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<MapCoordinates>> MapAsync(MapArgs? args, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Get no arguments.
+    /// </summary>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Person?>> GetNoArgsAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Gets the specified <see cref="PersonDetail"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="Person"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PersonDetail?>> GetDetailAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Updates an existing <see cref="PersonDetail"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="PersonDetail"/>.</param>
+    /// <param name="id">The <see cref="Person"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PersonDetail>> UpdateDetailAsync(PersonDetail value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Patches an existing <see cref="PersonDetail"/>.
+    /// </summary>
+    /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
+    /// <param name="value">The <see cref="string"/> that contains the patch content for the <see cref="PersonDetail"/>.</param>
+    /// <param name="id">The <see cref="Person"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PersonDetail>> PatchDetailAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Actually validating the FromBody parameter generation.
+    /// </summary>
+    /// <param name="person">The Person (see <see cref="Person"/>).</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult> AddAsync(Person person, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Actually validating the AcceptBody parameter generation.
+    /// </summary>
+    /// <param name="person">The Person (see <see cref="Person"/>).</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult> Add2Async(Person person, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Actually validating the Custom with Value parameter generation.
+    /// </summary>
+    /// <param name="value">The <see cref="Person"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult> Add3Async(Person value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Validate CustomManagerOnly.
+    /// </summary>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult> CustomManagerOnlyAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Get Null.
+    /// </summary>
+    /// <param name="name">The Name.</param>
+    /// <param name="names">The Names.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Person?>> GetNullAsync(string? name, List<string>? names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Validate when an Event is published but not sent.
+    /// </summary>
+    /// <param name="value">The <see cref="Person"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Person>> EventPublishNoSendAsync(Person value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Gets the <see cref="PersonCollectionResult"/> that contains the items that match the selection criteria.
+    /// </summary>
+    /// <param name="args">The Args (see <see cref="PersonArgs"/>).</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PersonCollectionResult>> GetByArgsWithEfAsync(PersonArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Throw Error.
+    /// </summary>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult> ThrowErrorAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Invoke Api Via Agent.
+    /// </summary>
+    /// <param name="id">The <see cref="Person"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<string>> InvokeApiViaAgentAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Param Coll.
+    /// </summary>
+    /// <param name="addresses">The Addresses.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult> ParamCollAsync(AddressCollection? addresses, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Gets the specified <see cref="Person"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="Person"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Person?>> GetWithEfAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Creates a new <see cref="Person"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="Person"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Person>> CreateWithEfAsync(Person value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Updates an existing <see cref="Person"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="Person"/>.</param>
+    /// <param name="id">The <see cref="Person"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Person>> UpdateWithEfAsync(Person value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Deletes the specified <see cref="Person"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="Person"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult> DeleteWithEfAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Patches an existing <see cref="Person"/>.
+    /// </summary>
+    /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
+    /// <param name="value">The <see cref="string"/> that contains the patch content for the <see cref="Person"/>.</param>
+    /// <param name="id">The <see cref="Person"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Person>> PatchWithEfAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Get Documentation.
+    /// </summary>
+    /// <param name="id">The <see cref="Person"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult> GetDocumentationAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Simulate Work.
+    /// </summary>
+    /// <param name="id">The <see cref="Person"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<string?>> SimulateWorkAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+
+    /// <summary>
+    /// Extend Response.
+    /// </summary>
+    /// <param name="name">The Name.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<string?>> ExtendResponseAsync(string? name, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 }
 
 #pragma warning restore
diff --git a/samples/Demo/Beef.Demo.Common/Agents/Generated/IPostalInfoAgent.cs b/samples/Demo/Beef.Demo.Common/Agents/Generated/IPostalInfoAgent.cs
index 6f72d2027..1e07a3adc 100644
--- a/samples/Demo/Beef.Demo.Common/Agents/Generated/IPostalInfoAgent.cs
+++ b/samples/Demo/Beef.Demo.Common/Agents/Generated/IPostalInfoAgent.cs
@@ -5,85 +5,71 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using Microsoft.Extensions.Logging;
-using Beef.Demo.Common.Entities;
-using RefDataNamespace = Beef.Demo.Common.Entities;
+namespace Beef.Demo.Common.Agents;
 
-namespace Beef.Demo.Common.Agents
+/// <summary>
+/// Defines the <see cref="PostalInfo"/> HTTP agent.
+/// </summary>
+public partial interface IPostalInfoAgent
 {
     /// <summary>
-    /// Defines the <see cref="PostalInfo"/> HTTP agent.
+    /// Gets the specified <see cref="PostalInfo"/>.
     /// </summary>
-    public partial interface IPostalInfoAgent
-    {
-        /// <summary>
-        /// Gets the specified <see cref="PostalInfo"/>.
-        /// </summary>
-        /// <param name="country">The Country.</param>
-        /// <param name="state">The State.</param>
-        /// <param name="city">The City.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PostalInfo?>> GetPostCodesAsync(string? country, string? state, string? city, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <param name="country">The Country.</param>
+    /// <param name="state">The State.</param>
+    /// <param name="city">The City.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PostalInfo?>> GetPostCodesAsync(string? country, string? state, string? city, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Creates a new <see cref="PostalInfo"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="PostalInfo"/>.</param>
-        /// <param name="country">The Country.</param>
-        /// <param name="state">The State.</param>
-        /// <param name="city">The City.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PostalInfo>> CreatePostCodesAsync(PostalInfo value, string? country, string? state, string? city, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Creates a new <see cref="PostalInfo"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="PostalInfo"/>.</param>
+    /// <param name="country">The Country.</param>
+    /// <param name="state">The State.</param>
+    /// <param name="city">The City.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PostalInfo>> CreatePostCodesAsync(PostalInfo value, string? country, string? state, string? city, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Updates an existing <see cref="PostalInfo"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="PostalInfo"/>.</param>
-        /// <param name="country">The Country.</param>
-        /// <param name="state">The State.</param>
-        /// <param name="city">The City.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PostalInfo>> UpdatePostCodesAsync(PostalInfo value, string? country, string? state, string? city, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Updates an existing <see cref="PostalInfo"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="PostalInfo"/>.</param>
+    /// <param name="country">The Country.</param>
+    /// <param name="state">The State.</param>
+    /// <param name="city">The City.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PostalInfo>> UpdatePostCodesAsync(PostalInfo value, string? country, string? state, string? city, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Patches an existing <see cref="PostalInfo"/>.
-        /// </summary>
-        /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
-        /// <param name="value">The <see cref="string"/> that contains the patch content for the <see cref="PostalInfo"/>.</param>
-        /// <param name="country">The Country.</param>
-        /// <param name="state">The State.</param>
-        /// <param name="city">The City.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PostalInfo>> PatchPostCodesAsync(HttpPatchOption patchOption, string value, string? country, string? state, string? city, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Patches an existing <see cref="PostalInfo"/>.
+    /// </summary>
+    /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
+    /// <param name="value">The <see cref="string"/> that contains the patch content for the <see cref="PostalInfo"/>.</param>
+    /// <param name="country">The Country.</param>
+    /// <param name="state">The State.</param>
+    /// <param name="city">The City.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PostalInfo>> PatchPostCodesAsync(HttpPatchOption patchOption, string value, string? country, string? state, string? city, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Deletes the specified <see cref="PostalInfo"/>.
-        /// </summary>
-        /// <param name="country">The Country.</param>
-        /// <param name="state">The State.</param>
-        /// <param name="city">The City.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult> DeletePostCodesAsync(string? country, string? state, string? city, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-    }
+    /// <summary>
+    /// Deletes the specified <see cref="PostalInfo"/>.
+    /// </summary>
+    /// <param name="country">The Country.</param>
+    /// <param name="state">The State.</param>
+    /// <param name="city">The City.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult> DeletePostCodesAsync(string? country, string? state, string? city, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 }
 
 #pragma warning restore
diff --git a/samples/Demo/Beef.Demo.Common/Agents/Generated/IReferenceDataAgent.cs b/samples/Demo/Beef.Demo.Common/Agents/Generated/IReferenceDataAgent.cs
index 7eedd9f1c..4ca2cd7ab 100644
--- a/samples/Demo/Beef.Demo.Common/Agents/Generated/IReferenceDataAgent.cs
+++ b/samples/Demo/Beef.Demo.Common/Agents/Generated/IReferenceDataAgent.cs
@@ -5,109 +5,94 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using CoreEx.RefData;
-using Microsoft.Extensions.Logging;
-using Beef.Demo.Common.Entities;
-using RefDataNamespace = Beef.Demo.Common.Entities;
+namespace Beef.Demo.Common.Agents;
 
-namespace Beef.Demo.Common.Agents
+/// <summary>
+/// Defines the <b>ReferenceData</b> HTTP agent.
+/// </summary>
+public partial interface IReferenceDataAgent
 {
     /// <summary>
-    /// Defines the <b>ReferenceData</b> HTTP agent.
+    /// Gets all of the <see cref="RefDataNamespace.Country"/> items that match the filter arguments.
     /// </summary>
-    public partial interface IReferenceDataAgent
-    {
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.Country"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.CountryCollection>> CountryGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.CountryCollection>> CountryGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.USState"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.USStateCollection>> USStateGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets all of the <see cref="RefDataNamespace.USState"/> items that match the filter arguments.
+    /// </summary>
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.USStateCollection>> USStateGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.Gender"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.GenderCollection>> GenderGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets all of the <see cref="RefDataNamespace.Gender"/> items that match the filter arguments.
+    /// </summary>
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.GenderCollection>> GenderGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.EyeColor"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.EyeColorCollection>> EyeColorGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets all of the <see cref="RefDataNamespace.EyeColor"/> items that match the filter arguments.
+    /// </summary>
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.EyeColorCollection>> EyeColorGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.PowerSource"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.PowerSourceCollection>> PowerSourceGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets all of the <see cref="RefDataNamespace.PowerSource"/> items that match the filter arguments.
+    /// </summary>
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.PowerSourceCollection>> PowerSourceGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.Company"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.CompanyCollection>> CompanyGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets all of the <see cref="RefDataNamespace.Company"/> items that match the filter arguments.
+    /// </summary>
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.CompanyCollection>> CompanyGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.Status"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.StatusCollection>> StatusGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets all of the <see cref="RefDataNamespace.Status"/> items that match the filter arguments.
+    /// </summary>
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.StatusCollection>> StatusGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.CommunicationType"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.CommunicationTypeCollection>> CommunicationTypeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets all of the <see cref="RefDataNamespace.CommunicationType"/> items that match the filter arguments.
+    /// </summary>
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.CommunicationTypeCollection>> CommunicationTypeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets the reference data entries for the specified entities and codes from the query string; e.g: api/v1/demo/ref?entity=codeX,codeY&amp;entity2=codeZ&amp;entity3
-        /// </summary>
-        /// <param name="names">The optional list of reference data names.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        /// <remarks>The reference data objects will need to be manually extracted from the corresponding response content.</remarks>
-        Task<HttpResult> GetNamedAsync(string[] names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-    }
+    /// <summary>
+    /// Gets the reference data entries for the specified entities and codes from the query string; e.g: api/v1/demo/ref?entity=codeX,codeY&amp;entity2=codeZ&amp;entity3
+    /// </summary>
+    /// <param name="names">The optional list of reference data names.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    /// <remarks>The reference data objects will need to be manually extracted from the corresponding response content.</remarks>
+    Task<HttpResult> GetNamedAsync(string[] names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 }
 
 #pragma warning restore
diff --git a/samples/Demo/Beef.Demo.Common/Agents/Generated/IRobotAgent.cs b/samples/Demo/Beef.Demo.Common/Agents/Generated/IRobotAgent.cs
index a3b2ba53d..ebf975de9 100644
--- a/samples/Demo/Beef.Demo.Common/Agents/Generated/IRobotAgent.cs
+++ b/samples/Demo/Beef.Demo.Common/Agents/Generated/IRobotAgent.cs
@@ -5,94 +5,80 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using Microsoft.Extensions.Logging;
-using Beef.Demo.Common.Entities;
-using RefDataNamespace = Beef.Demo.Common.Entities;
+namespace Beef.Demo.Common.Agents;
 
-namespace Beef.Demo.Common.Agents
+/// <summary>
+/// Defines the <see cref="Robot"/> HTTP agent.
+/// </summary>
+public partial interface IRobotAgent
 {
     /// <summary>
-    /// Defines the <see cref="Robot"/> HTTP agent.
+    /// Get the R-O-B-O-T.
     /// </summary>
-    public partial interface IRobotAgent
-    {
-        /// <summary>
-        /// Get the R-O-B-O-T.
-        /// </summary>
-        /// <param name="id">The <see cref="Robot"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Robot?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <param name="id">The <see cref="Robot"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Robot?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Creates a new <see cref="Robot"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="Robot"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Robot>> CreateAsync(Robot value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Creates a new <see cref="Robot"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="Robot"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Robot>> CreateAsync(Robot value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Updates an existing <see cref="Robot"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="Robot"/>.</param>
-        /// <param name="id">The <see cref="Robot"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Robot>> UpdateAsync(Robot value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Updates an existing <see cref="Robot"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="Robot"/>.</param>
+    /// <param name="id">The <see cref="Robot"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Robot>> UpdateAsync(Robot value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Patches an existing <see cref="Robot"/>.
-        /// </summary>
-        /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
-        /// <param name="value">The <see cref="string"/> that contains the patch content for the <see cref="Robot"/>.</param>
-        /// <param name="id">The <see cref="Robot"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Robot>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Patches an existing <see cref="Robot"/>.
+    /// </summary>
+    /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
+    /// <param name="value">The <see cref="string"/> that contains the patch content for the <see cref="Robot"/>.</param>
+    /// <param name="id">The <see cref="Robot"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Robot>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Deletes the specified <see cref="Robot"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="Robot"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Deletes the specified <see cref="Robot"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="Robot"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets the <see cref="RobotCollectionResult"/> that contains the items that match the selection criteria.
-        /// </summary>
-        /// <param name="args">The Args (see <see cref="RobotArgs"/>).</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RobotCollectionResult>> GetByArgsAsync(RobotArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets the <see cref="RobotCollectionResult"/> that contains the items that match the selection criteria.
+    /// </summary>
+    /// <param name="args">The Args (see <see cref="RobotArgs"/>).</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RobotCollectionResult>> GetByArgsAsync(RobotArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Raises a <see cref="Robot.PowerSource"/> change event.
-        /// </summary>
-        /// <param name="id">The <see cref="Robot"/> identifier.</param>
-        /// <param name="powerSource">The Power Source.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult> RaisePowerSourceChangeAsync(Guid id, string? powerSource, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-    }
+    /// <summary>
+    /// Raises a <see cref="Robot.PowerSource"/> change event.
+    /// </summary>
+    /// <param name="id">The <see cref="Robot"/> identifier.</param>
+    /// <param name="powerSource">The Power Source.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult> RaisePowerSourceChangeAsync(Guid id, string? powerSource, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 }
 
 #pragma warning restore
diff --git a/samples/Demo/Beef.Demo.Common/Agents/Generated/PersonAgent.cs b/samples/Demo/Beef.Demo.Common/Agents/Generated/PersonAgent.cs
index 79d90e6f3..27a2549de 100644
--- a/samples/Demo/Beef.Demo.Common/Agents/Generated/PersonAgent.cs
+++ b/samples/Demo/Beef.Demo.Common/Agents/Generated/PersonAgent.cs
@@ -5,176 +5,164 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using Beef.Demo.Common.Entities;
-using RefDataNamespace = Beef.Demo.Common.Entities;
-
-namespace Beef.Demo.Common.Agents
+namespace Beef.Demo.Common.Agents;
+
+/// <summary>
+/// Provides the <see cref="Person"/> HTTP agent.
+/// </summary>
+public partial class PersonAgent : TypedHttpClientBase<PersonAgent>, IPersonAgent
 {
     /// <summary>
-    /// Provides the <see cref="Person"/> HTTP agent.
+    /// Initializes a new instance of the <see cref="PersonAgent"/> class.
     /// </summary>
-    public partial class PersonAgent : TypedHttpClientBase<PersonAgent>, IPersonAgent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PersonAgent"/> class.
-        /// </summary>
-        /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
-        /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
-        public PersonAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Person>> CreateAsync(Person value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync<Person, Person>("api/v1/persons", value, requestOptions: requestOptions, cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => DeleteAsync("api/v1/persons/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Person?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<Person?>("api/v1/persons/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Person?>> GetExAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<Person?>("api/v1/persons/ex/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Person>> UpdateAsync(Person value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PutAsync<Person, Person>("api/v1/persons/{id}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Person>> UpdateWithRollbackAsync(Person value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PutAsync<Person, Person>("api/v1/persons/withRollback/{id}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Person>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PatchAsync<Person>("api/v1/persons/{id}", patchOption, value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PersonCollectionResult>> GetAllAsync(PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<PersonCollectionResult>("api/v1/persons/all", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PersonCollectionResult>> GetAll2Async(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<PersonCollectionResult>("api/v1/persons/allnopaging", requestOptions: requestOptions, cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PersonCollectionResult>> GetByArgsAsync(PersonArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<PersonCollectionResult>("api/v1/persons", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(new HttpArg<PersonArgs?>("args", args, HttpArgType.FromUriUseProperties)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PersonDetailCollectionResult>> GetDetailByArgsAsync(PersonArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<PersonDetailCollectionResult>("api/v1/persons/argsdetail", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(new HttpArg<PersonArgs?>("args", args, HttpArgType.FromUriUseProperties)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Person>> MergeAsync(Guid fromId, Guid toId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync<Person>("api/v1/persons/merge", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("fromId", fromId), new HttpArg<Guid>("toId", toId)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult> MarkAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync("api/v1/persons/mark", requestOptions: requestOptions, cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<MapCoordinates>> MapAsync(MapArgs? args, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync<MapCoordinates>("api/v1/persons/map", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<MapArgs?>("args", args, HttpArgType.FromUriUseProperties)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Person?>> GetNoArgsAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<Person?>("api/v1/persons/noargsforme", requestOptions: requestOptions, cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PersonDetail?>> GetDetailAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<PersonDetail?>("api/v1/persons/{id}/detail", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PersonDetail>> UpdateDetailAsync(PersonDetail value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PutAsync<PersonDetail, PersonDetail>("api/v1/persons/{id}/detail", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PersonDetail>> PatchDetailAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PatchAsync<PersonDetail>("api/v1/persons/{id}/detail", patchOption, value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult> AddAsync(Person person, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync("api/v1/persons/fromBody", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Person>("person", person, HttpArgType.FromBody)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult> Add2Async(Person person, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync<Person>("api/v1/persons/acceptsBody", person, requestOptions: requestOptions, cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult> Add3Async(Person value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync<Person>("api/v1/persons/acceptsBodyValue", value, requestOptions: requestOptions, cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult> CustomManagerOnlyAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync("api/v1/persons/cmo", requestOptions: requestOptions, cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Person?>> GetNullAsync(string? name, List<string>? names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<Person?>("api/v1/persons/null", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<string?>("name", name), new HttpArg<List<string>?>("names", names)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Person>> EventPublishNoSendAsync(Person value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PutAsync<Person, Person>("api/v1/persons/publishnosend", value, requestOptions: requestOptions, cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PersonCollectionResult>> GetByArgsWithEfAsync(PersonArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<PersonCollectionResult>("api/v1/persons/args", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(new HttpArg<PersonArgs?>("args", args, HttpArgType.FromUriUseProperties)), cancellationToken: cancellationToken);
+    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
+    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
+    /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
+    public PersonAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Person>> CreateAsync(Person value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync<Person, Person>("api/v1/persons", value, requestOptions: requestOptions, cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => DeleteAsync("api/v1/persons/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Person?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<Person?>("api/v1/persons/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Person?>> GetExAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<Person?>("api/v1/persons/ex/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Person>> UpdateAsync(Person value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PutAsync<Person, Person>("api/v1/persons/{id}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Person>> UpdateWithRollbackAsync(Person value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PutAsync<Person, Person>("api/v1/persons/withRollback/{id}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Person>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PatchAsync<Person>("api/v1/persons/{id}", patchOption, value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PersonCollectionResult>> GetAllAsync(PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<PersonCollectionResult>("api/v1/persons/all", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PersonCollectionResult>> GetAll2Async(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<PersonCollectionResult>("api/v1/persons/allnopaging", requestOptions: requestOptions, cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PersonCollectionResult>> GetByArgsAsync(PersonArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<PersonCollectionResult>("api/v1/persons", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(new HttpArg<PersonArgs?>("args", args, HttpArgType.FromUriUseProperties)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PersonDetailCollectionResult>> GetDetailByArgsAsync(PersonArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<PersonDetailCollectionResult>("api/v1/persons/argsdetail", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(new HttpArg<PersonArgs?>("args", args, HttpArgType.FromUriUseProperties)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Person>> MergeAsync(Guid fromId, Guid toId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync<Person>("api/v1/persons/merge", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("fromId", fromId), new HttpArg<Guid>("toId", toId)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult> MarkAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync("api/v1/persons/mark", requestOptions: requestOptions, cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<MapCoordinates>> MapAsync(MapArgs? args, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync<MapCoordinates>("api/v1/persons/map", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<MapArgs?>("args", args, HttpArgType.FromUriUseProperties)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Person?>> GetNoArgsAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<Person?>("api/v1/persons/noargsforme", requestOptions: requestOptions, cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PersonDetail?>> GetDetailAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<PersonDetail?>("api/v1/persons/{id}/detail", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PersonDetail>> UpdateDetailAsync(PersonDetail value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PutAsync<PersonDetail, PersonDetail>("api/v1/persons/{id}/detail", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PersonDetail>> PatchDetailAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PatchAsync<PersonDetail>("api/v1/persons/{id}/detail", patchOption, value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult> AddAsync(Person person, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync("api/v1/persons/fromBody", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Person>("person", person, HttpArgType.FromBody)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult> Add2Async(Person person, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync<Person>("api/v1/persons/acceptsBody", person, requestOptions: requestOptions, cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult> Add3Async(Person value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync<Person>("api/v1/persons/acceptsBodyValue", value, requestOptions: requestOptions, cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult> CustomManagerOnlyAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync("api/v1/persons/cmo", requestOptions: requestOptions, cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Person?>> GetNullAsync(string? name, List<string>? names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<Person?>("api/v1/persons/null", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<string?>("name", name), new HttpArg<List<string>?>("names", names)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Person>> EventPublishNoSendAsync(Person value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PutAsync<Person, Person>("api/v1/persons/publishnosend", value, requestOptions: requestOptions, cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PersonCollectionResult>> GetByArgsWithEfAsync(PersonArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<PersonCollectionResult>("api/v1/persons/args", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(new HttpArg<PersonArgs?>("args", args, HttpArgType.FromUriUseProperties)), cancellationToken: cancellationToken);
 
-        /// <inheritdoc/>
-        public Task<HttpResult> ThrowErrorAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync("api/v1/persons/error", requestOptions: requestOptions, cancellationToken: cancellationToken);
+    /// <inheritdoc/>
+    public Task<HttpResult> ThrowErrorAsync(HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync("api/v1/persons/error", requestOptions: requestOptions, cancellationToken: cancellationToken);
 
-        /// <inheritdoc/>
-        public Task<HttpResult<string>> InvokeApiViaAgentAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync<string>("api/v1/persons/invokeApi", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+    /// <inheritdoc/>
+    public Task<HttpResult<string>> InvokeApiViaAgentAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync<string>("api/v1/persons/invokeApi", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
 
-        /// <inheritdoc/>
-        public Task<HttpResult> ParamCollAsync(AddressCollection? addresses, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync("api/v1/persons/paramcoll", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<AddressCollection?>("addresses", addresses, HttpArgType.FromBody)), cancellationToken: cancellationToken);
+    /// <inheritdoc/>
+    public Task<HttpResult> ParamCollAsync(AddressCollection? addresses, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync("api/v1/persons/paramcoll", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<AddressCollection?>("addresses", addresses, HttpArgType.FromBody)), cancellationToken: cancellationToken);
 
-        /// <inheritdoc/>
-        public Task<HttpResult<Person?>> GetWithEfAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<Person?>("api/v1/persons/ef/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+    /// <inheritdoc/>
+    public Task<HttpResult<Person?>> GetWithEfAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<Person?>("api/v1/persons/ef/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
 
-        /// <inheritdoc/>
-        public Task<HttpResult<Person>> CreateWithEfAsync(Person value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync<Person, Person>("api/v1/persons/ef", value, requestOptions: requestOptions, cancellationToken: cancellationToken);
+    /// <inheritdoc/>
+    public Task<HttpResult<Person>> CreateWithEfAsync(Person value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync<Person, Person>("api/v1/persons/ef", value, requestOptions: requestOptions, cancellationToken: cancellationToken);
 
-        /// <inheritdoc/>
-        public Task<HttpResult<Person>> UpdateWithEfAsync(Person value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PutAsync<Person, Person>("api/v1/persons/ef/{id}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+    /// <inheritdoc/>
+    public Task<HttpResult<Person>> UpdateWithEfAsync(Person value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PutAsync<Person, Person>("api/v1/persons/ef/{id}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
 
-        /// <inheritdoc/>
-        public Task<HttpResult> DeleteWithEfAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => DeleteAsync("api/v1/persons/ef/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+    /// <inheritdoc/>
+    public Task<HttpResult> DeleteWithEfAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => DeleteAsync("api/v1/persons/ef/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
 
-        /// <inheritdoc/>
-        public Task<HttpResult<Person>> PatchWithEfAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PatchAsync<Person>("api/v1/persons/ef/{id}", patchOption, value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+    /// <inheritdoc/>
+    public Task<HttpResult<Person>> PatchWithEfAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PatchAsync<Person>("api/v1/persons/ef/{id}", patchOption, value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
 
-        /// <inheritdoc/>
-        public Task<HttpResult> GetDocumentationAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync("api/v1/persons/{id}/documentation", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+    /// <inheritdoc/>
+    public Task<HttpResult> GetDocumentationAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync("api/v1/persons/{id}/documentation", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
 
-        /// <inheritdoc/>
-        public Task<HttpResult<string?>> SimulateWorkAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<string?>("api/v1/persons/simulate", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+    /// <inheritdoc/>
+    public Task<HttpResult<string?>> SimulateWorkAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<string?>("api/v1/persons/simulate", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
 
-        /// <inheritdoc/>
-        public Task<HttpResult<string?>> ExtendResponseAsync(string? name, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync<string?>("api/v1/persons/extend-response", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<string?>("name", name)), cancellationToken: cancellationToken);
-    }
+    /// <inheritdoc/>
+    public Task<HttpResult<string?>> ExtendResponseAsync(string? name, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync<string?>("api/v1/persons/extend-response", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<string?>("name", name)), cancellationToken: cancellationToken);
 }
 
 #pragma warning restore
diff --git a/samples/Demo/Beef.Demo.Common/Agents/Generated/PostalInfoAgent.cs b/samples/Demo/Beef.Demo.Common/Agents/Generated/PostalInfoAgent.cs
index 5e18fec12..ad6641084 100644
--- a/samples/Demo/Beef.Demo.Common/Agents/Generated/PostalInfoAgent.cs
+++ b/samples/Demo/Beef.Demo.Common/Agents/Generated/PostalInfoAgent.cs
@@ -5,52 +5,40 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using Beef.Demo.Common.Entities;
-using RefDataNamespace = Beef.Demo.Common.Entities;
-
-namespace Beef.Demo.Common.Agents
+namespace Beef.Demo.Common.Agents;
+
+/// <summary>
+/// Provides the <see cref="PostalInfo"/> HTTP agent.
+/// </summary>
+public partial class PostalInfoAgent : TypedHttpClientBase<PostalInfoAgent>, IPostalInfoAgent
 {
     /// <summary>
-    /// Provides the <see cref="PostalInfo"/> HTTP agent.
+    /// Initializes a new instance of the <see cref="PostalInfoAgent"/> class.
     /// </summary>
-    public partial class PostalInfoAgent : TypedHttpClientBase<PostalInfoAgent>, IPostalInfoAgent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PostalInfoAgent"/> class.
-        /// </summary>
-        /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
-        /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
-        public PostalInfoAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PostalInfo?>> GetPostCodesAsync(string? country, string? state, string? city, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<PostalInfo?>("api/v1/postal/{country}/{state}/{city}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<string?>("country", country), new HttpArg<string?>("state", state), new HttpArg<string?>("city", city)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PostalInfo>> CreatePostCodesAsync(PostalInfo value, string? country, string? state, string? city, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync<PostalInfo, PostalInfo>("api/v1/postal/{country}/{state}/{city}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<string?>("country", country), new HttpArg<string?>("state", state), new HttpArg<string?>("city", city)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PostalInfo>> UpdatePostCodesAsync(PostalInfo value, string? country, string? state, string? city, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PutAsync<PostalInfo, PostalInfo>("api/v1/postal/{country}/{state}/{city}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<string?>("country", country), new HttpArg<string?>("state", state), new HttpArg<string?>("city", city)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PostalInfo>> PatchPostCodesAsync(HttpPatchOption patchOption, string value, string? country, string? state, string? city, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PatchAsync<PostalInfo>("api/v1/postal/{country}/{state}/{city}", patchOption, value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<string?>("country", country), new HttpArg<string?>("state", state), new HttpArg<string?>("city", city)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult> DeletePostCodesAsync(string? country, string? state, string? city, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => DeleteAsync("api/v1/postal/{country}/{state}/{city}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<string?>("country", country), new HttpArg<string?>("state", state), new HttpArg<string?>("city", city)), cancellationToken: cancellationToken);
-    }
+    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
+    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
+    /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
+    public PostalInfoAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PostalInfo?>> GetPostCodesAsync(string? country, string? state, string? city, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<PostalInfo?>("api/v1/postal/{country}/{state}/{city}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<string?>("country", country), new HttpArg<string?>("state", state), new HttpArg<string?>("city", city)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PostalInfo>> CreatePostCodesAsync(PostalInfo value, string? country, string? state, string? city, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync<PostalInfo, PostalInfo>("api/v1/postal/{country}/{state}/{city}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<string?>("country", country), new HttpArg<string?>("state", state), new HttpArg<string?>("city", city)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PostalInfo>> UpdatePostCodesAsync(PostalInfo value, string? country, string? state, string? city, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PutAsync<PostalInfo, PostalInfo>("api/v1/postal/{country}/{state}/{city}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<string?>("country", country), new HttpArg<string?>("state", state), new HttpArg<string?>("city", city)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PostalInfo>> PatchPostCodesAsync(HttpPatchOption patchOption, string value, string? country, string? state, string? city, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PatchAsync<PostalInfo>("api/v1/postal/{country}/{state}/{city}", patchOption, value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<string?>("country", country), new HttpArg<string?>("state", state), new HttpArg<string?>("city", city)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult> DeletePostCodesAsync(string? country, string? state, string? city, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => DeleteAsync("api/v1/postal/{country}/{state}/{city}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<string?>("country", country), new HttpArg<string?>("state", state), new HttpArg<string?>("city", city)), cancellationToken: cancellationToken);
 }
 
 #pragma warning restore
diff --git a/samples/Demo/Beef.Demo.Common/Agents/Generated/ReferenceDataAgent.cs b/samples/Demo/Beef.Demo.Common/Agents/Generated/ReferenceDataAgent.cs
index f2c96b01a..6550d601f 100644
--- a/samples/Demo/Beef.Demo.Common/Agents/Generated/ReferenceDataAgent.cs
+++ b/samples/Demo/Beef.Demo.Common/Agents/Generated/ReferenceDataAgent.cs
@@ -5,74 +5,61 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using CoreEx.RefData;
-using Beef.Demo.Common.Entities;
-using RefDataNamespace = Beef.Demo.Common.Entities;
+namespace Beef.Demo.Common.Agents;
 
-namespace Beef.Demo.Common.Agents
+/// <summary>
+/// Provides the <b>ReferenceData</b> HTTP agent.
+/// </summary>
+public partial class ReferenceDataAgent : TypedHttpClientBase<ReferenceDataAgent>, IReferenceDataAgent
 {
     /// <summary>
-    /// Provides the <b>ReferenceData</b> HTTP agent.
+    /// Initializes a new instance of the <see cref="ReferenceDataAgent"/> class.
     /// </summary>
-    public partial class ReferenceDataAgent : TypedHttpClientBase<ReferenceDataAgent>, IReferenceDataAgent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReferenceDataAgent"/> class.
-        /// </summary>
-        /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
-        /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
-        public ReferenceDataAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
+    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
+    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
+    /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
+    public ReferenceDataAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
 
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.CountryCollection>> CountryGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.CountryCollection>("api/v1/demo/ref/countries", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.CountryCollection>> CountryGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.CountryCollection>("api/v1/demo/ref/countries", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
 
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.USStateCollection>> USStateGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.USStateCollection>("api/v1/demo/ref/usStates", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.USStateCollection>> USStateGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.USStateCollection>("api/v1/demo/ref/usStates", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
 
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.GenderCollection>> GenderGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.GenderCollection>("api/v1/demo/ref/genders", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.GenderCollection>> GenderGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.GenderCollection>("api/v1/demo/ref/genders", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
 
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.EyeColorCollection>> EyeColorGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.EyeColorCollection>("api/v1/demo/ref/eyeColors", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.EyeColorCollection>> EyeColorGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.EyeColorCollection>("api/v1/demo/ref/eyeColors", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
 
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.PowerSourceCollection>> PowerSourceGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.PowerSourceCollection>("api/v1/demo/ref/powerSources", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.PowerSourceCollection>> PowerSourceGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.PowerSourceCollection>("api/v1/demo/ref/powerSources", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
 
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.CompanyCollection>> CompanyGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.CompanyCollection>("api/v1/demo/ref/companies", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.CompanyCollection>> CompanyGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.CompanyCollection>("api/v1/demo/ref/companies", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
 
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.StatusCollection>> StatusGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.StatusCollection>("api/v1/demo/ref/statuses", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.StatusCollection>> StatusGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.StatusCollection>("api/v1/demo/ref/statuses", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
 
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.CommunicationTypeCollection>> CommunicationTypeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.CommunicationTypeCollection>("api/v1/demo/ref/communicationTypes", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.CommunicationTypeCollection>> CommunicationTypeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.CommunicationTypeCollection>("api/v1/demo/ref/communicationTypes", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
 
-        /// <inheritdoc/>
-        public Task<HttpResult> GetNamedAsync(string[] names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-        {
-            var ro = requestOptions ?? new HttpRequestOptions();
-            if (names != null)
-                ro.UrlQueryString += string.Join("&", names);
-                
-            return GetAsync("api/v1/demo/ref", ro, null, cancellationToken);
-        }
+    /// <inheritdoc/>
+    public Task<HttpResult> GetNamedAsync(string[] names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+    {
+        var ro = requestOptions ?? new HttpRequestOptions();
+        if (names != null)
+            ro.UrlQueryString += string.Join("&", names);
+            
+        return GetAsync("api/v1/demo/ref", ro, null, cancellationToken);
     }
 }
 
diff --git a/samples/Demo/Beef.Demo.Common/Agents/Generated/RobotAgent.cs b/samples/Demo/Beef.Demo.Common/Agents/Generated/RobotAgent.cs
index c3df84a4c..261a249dd 100644
--- a/samples/Demo/Beef.Demo.Common/Agents/Generated/RobotAgent.cs
+++ b/samples/Demo/Beef.Demo.Common/Agents/Generated/RobotAgent.cs
@@ -5,60 +5,48 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using Beef.Demo.Common.Entities;
-using RefDataNamespace = Beef.Demo.Common.Entities;
+namespace Beef.Demo.Common.Agents;
 
-namespace Beef.Demo.Common.Agents
+/// <summary>
+/// Provides the <see cref="Robot"/> HTTP agent.
+/// </summary>
+public partial class RobotAgent : TypedHttpClientBase<RobotAgent>, IRobotAgent
 {
     /// <summary>
-    /// Provides the <see cref="Robot"/> HTTP agent.
+    /// Initializes a new instance of the <see cref="RobotAgent"/> class.
     /// </summary>
-    public partial class RobotAgent : TypedHttpClientBase<RobotAgent>, IRobotAgent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RobotAgent"/> class.
-        /// </summary>
-        /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
-        /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
-        public RobotAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Robot?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<Robot?>("api/v1/robots/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Robot>> CreateAsync(Robot value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync<Robot, Robot>("api/v1/robots", value, requestOptions: requestOptions, cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Robot>> UpdateAsync(Robot value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PutAsync<Robot, Robot>("api/v1/robots/{id}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Robot>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PatchAsync<Robot>("api/v1/robots/{id}", patchOption, value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => DeleteAsync("api/v1/robots/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<RobotCollectionResult>> GetByArgsAsync(RobotArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RobotCollectionResult>("api/v1/robots", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(new HttpArg<RobotArgs?>("args", args, HttpArgType.FromUriUseProperties)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult> RaisePowerSourceChangeAsync(Guid id, string? powerSource, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync("api/v1/robots/{id}/powerSource/{powerSource}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id), new HttpArg<string?>("powerSource", powerSource)), cancellationToken: cancellationToken);
-    }
+    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
+    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
+    /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
+    public RobotAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Robot?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<Robot?>("api/v1/robots/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Robot>> CreateAsync(Robot value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync<Robot, Robot>("api/v1/robots", value, requestOptions: requestOptions, cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Robot>> UpdateAsync(Robot value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PutAsync<Robot, Robot>("api/v1/robots/{id}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Robot>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PatchAsync<Robot>("api/v1/robots/{id}", patchOption, value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => DeleteAsync("api/v1/robots/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<RobotCollectionResult>> GetByArgsAsync(RobotArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RobotCollectionResult>("api/v1/robots", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(new HttpArg<RobotArgs?>("args", args, HttpArgType.FromUriUseProperties)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult> RaisePowerSourceChangeAsync(Guid id, string? powerSource, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync("api/v1/robots/{id}/powerSource/{powerSource}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id), new HttpArg<string?>("powerSource", powerSource)), cancellationToken: cancellationToken);
 }
 
 #pragma warning restore
diff --git a/samples/Demo/Beef.Demo.Common/Beef.Demo.Common.csproj b/samples/Demo/Beef.Demo.Common/Beef.Demo.Common.csproj
index 608f72760..ce4a4d2c1 100644
--- a/samples/Demo/Beef.Demo.Common/Beef.Demo.Common.csproj
+++ b/samples/Demo/Beef.Demo.Common/Beef.Demo.Common.csproj
@@ -2,6 +2,8 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <Nullable>enable</Nullable>
+    <LangVersion>Preview</LangVersion>
+    <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="Agents\" />
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/Address.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/Address.cs
index 6308043eb..c94c7c466 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/Address.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/Address.cs
@@ -5,35 +5,29 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
+/// <summary>
+/// Represents the Address entity.
+/// </summary>
+public partial class Address
 {
     /// <summary>
-    /// Represents the Address entity.
+    /// Gets or sets the Street.
     /// </summary>
-    public partial class Address
-    {
-        /// <summary>
-        /// Gets or sets the Street.
-        /// </summary>
-        public string? Street { get; set; }
-
-        /// <summary>
-        /// Gets or sets the City.
-        /// </summary>
-        public string? City { get; set; }
-    }
+    public string? Street { get; set; }
 
     /// <summary>
-    /// Represents the <c>Address</c> collection.
+    /// Gets or sets the City.
     /// </summary>
-    public partial class AddressCollection : List<Address> { }
+    public string? City { get; set; }
 }
 
+/// <summary>
+/// Represents the <c>Address</c> collection.
+/// </summary>
+public partial class AddressCollection : List<Address> { }
+
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/CommunicationType.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/CommunicationType.cs
index 8ae43d87b..cdefd4788 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/CommunicationType.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/CommunicationType.cs
@@ -5,25 +5,18 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
-{
-    /// <summary>
-    /// Represents the Communication Type entity.
-    /// </summary>
-    public partial class CommunicationType : ReferenceDataBase<int> { }
+/// <summary>
+/// Represents the Communication Type entity.
+/// </summary>
+public partial class CommunicationType : ReferenceDataBase<int> { }
+
+/// <summary>
+/// Represents the <c>CommunicationType</c> collection.
+/// </summary>
+public partial class CommunicationTypeCollection : List<CommunicationType> { }
 
-    /// <summary>
-    /// Represents the <c>CommunicationType</c> collection.
-    /// </summary>
-    public partial class CommunicationTypeCollection : List<CommunicationType> { }
-}
 
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/Company.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/Company.cs
index 53f22735a..7d265947e 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/Company.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/Company.cs
@@ -5,31 +5,24 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
+/// <summary>
+/// Represents the Company entity.
+/// </summary>
+public partial class Company : ReferenceDataBase<Guid>
 {
     /// <summary>
-    /// Represents the Company entity.
+    /// Gets or sets the External Code.
     /// </summary>
-    public partial class Company : ReferenceDataBase<Guid>
-    {
-        /// <summary>
-        /// Gets or sets the External Code.
-        /// </summary>
-        public string? ExternalCode { get; set; }
-    }
-
-    /// <summary>
-    /// Represents the <c>Company</c> collection.
-    /// </summary>
-    public partial class CompanyCollection : List<Company> { }
+    public string? ExternalCode { get; set; }
 }
 
+/// <summary>
+/// Represents the <c>Company</c> collection.
+/// </summary>
+public partial class CompanyCollection : List<Company> { }
+
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/Contact.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/Contact.cs
index a411a5a0a..2abd063fd 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/Contact.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/Contact.cs
@@ -5,79 +5,73 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
+/// <summary>
+/// Represents the Contact entity.
+/// </summary>
+public partial class Contact : IIdentifier<Guid>
 {
     /// <summary>
-    /// Represents the Contact entity.
+    /// Gets or sets the <c>Contact</c> identifier.
     /// </summary>
-    public partial class Contact : IIdentifier<Guid>
-    {
-        /// <summary>
-        /// Gets or sets the <c>Contact</c> identifier.
-        /// </summary>
-        public Guid Id { get; set; }
+    public Guid Id { get; set; }
 
-        /// <summary>
-        /// Gets or sets the First Name.
-        /// </summary>
-        public string? FirstName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Last Name.
-        /// </summary>
-        public string? LastName { get; set; }
+    /// <summary>
+    /// Gets or sets the First Name.
+    /// </summary>
+    public string? FirstName { get; set; }
 
-        /// <summary>
-        /// Gets the corresponding <c>Status</c> text (read-only where selected).
-        /// </summary>
-        public string? StatusDescription { get; set; }
+    /// <summary>
+    /// Gets or sets the Last Name.
+    /// </summary>
+    public string? LastName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Status code.
-        /// </summary>
-        public string? Status { get; set; }
+    /// <summary>
+    /// Gets the corresponding <c>Status</c> text (read-only where selected).
+    /// </summary>
+    public string? StatusDescription { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Communications.
-        /// </summary>
-        public ContactCommCollection? Communications { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the Status code.
+    /// </summary>
+    public string? Status { get; set; }
 
     /// <summary>
-    /// Represents the <c>Contact</c> collection.
+    /// Gets or sets the Communications.
     /// </summary>
-    public partial class ContactCollection : List<Contact> { }
+    public ContactCommCollection? Communications { get; set; }
+}
+
+/// <summary>
+/// Represents the <c>Contact</c> collection.
+/// </summary>
+public partial class ContactCollection : List<Contact> { }
 
+/// <summary>
+/// Represents the <c>Contact</c> collection result.
+/// </summary>
+public class ContactCollectionResult : CollectionResult<ContactCollection, Contact>
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ContactCollectionResult"/> class.
+    /// </summary>
+    public ContactCollectionResult() { }
+    
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ContactCollectionResult"/> class with <paramref name="paging"/>.
+    /// </summary>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public ContactCollectionResult(PagingArgs? paging) : base(paging) { }
+    
     /// <summary>
-    /// Represents the <c>Contact</c> collection result.
+    /// Initializes a new instance of the <see cref="ContactCollectionResult"/> class with <paramref name="items"/> to add.
     /// </summary>
-    public class ContactCollectionResult : CollectionResult<ContactCollection, Contact>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ContactCollectionResult"/> class.
-        /// </summary>
-        public ContactCollectionResult() { }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ContactCollectionResult"/> class with <paramref name="paging"/>.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public ContactCollectionResult(PagingArgs? paging) : base(paging) { }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ContactCollectionResult"/> class with <paramref name="items"/> to add.
-        /// </summary>
-        /// <param name="items">The items to add.</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public ContactCollectionResult(IEnumerable<Contact> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
-    }
+    /// <param name="items">The items to add.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public ContactCollectionResult(IEnumerable<Contact> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
 }
 
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/ContactComm.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/ContactComm.cs
index 4da9295c3..4f3f0a90b 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/ContactComm.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/ContactComm.cs
@@ -5,35 +5,29 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
+/// <summary>
+/// Represents the <c>Contact</c> Comm entity.
+/// </summary>
+public partial class ContactComm
 {
     /// <summary>
-    /// Represents the <c>Contact</c> Comm entity.
+    /// Gets or sets the Value.
     /// </summary>
-    public partial class ContactComm
-    {
-        /// <summary>
-        /// Gets or sets the Value.
-        /// </summary>
-        public string? Value { get; set; }
-
-        /// <summary>
-        /// Indicates whether Communication is the preferred (only one).
-        /// </summary>
-        public bool IsPreferred { get; set; }
-    }
+    public string? Value { get; set; }
 
     /// <summary>
-    /// Represents the <c>ContactComm</c> collection.
+    /// Indicates whether Communication is the preferred (only one).
     /// </summary>
-    public partial class ContactCommCollection : Dictionary<string, ContactComm> { }
+    public bool IsPreferred { get; set; }
 }
 
+/// <summary>
+/// Represents the <c>ContactComm</c> collection.
+/// </summary>
+public partial class ContactCommCollection : Dictionary<string, ContactComm> { }
+
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/Country.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/Country.cs
index 3a7e74b5b..4d2049880 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/Country.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/Country.cs
@@ -5,25 +5,18 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
-{
-    /// <summary>
-    /// Represents the Country entity.
-    /// </summary>
-    public partial class Country : ReferenceDataBase<Guid> { }
+/// <summary>
+/// Represents the Country entity.
+/// </summary>
+public partial class Country : ReferenceDataBase<Guid> { }
+
+/// <summary>
+/// Represents the <c>Country</c> collection.
+/// </summary>
+public partial class CountryCollection : List<Country> { }
 
-    /// <summary>
-    /// Represents the <c>Country</c> collection.
-    /// </summary>
-    public partial class CountryCollection : List<Country> { }
-}
 
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/EyeColor.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/EyeColor.cs
index f737391a5..7d0d844e7 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/EyeColor.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/EyeColor.cs
@@ -5,25 +5,18 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
-{
-    /// <summary>
-    /// Represents the Eye Color entity.
-    /// </summary>
-    public partial class EyeColor : ReferenceDataBase<Guid> { }
+/// <summary>
+/// Represents the Eye Color entity.
+/// </summary>
+public partial class EyeColor : ReferenceDataBase<Guid> { }
+
+/// <summary>
+/// Represents the <c>EyeColor</c> collection.
+/// </summary>
+public partial class EyeColorCollection : List<EyeColor> { }
 
-    /// <summary>
-    /// Represents the <c>EyeColor</c> collection.
-    /// </summary>
-    public partial class EyeColorCollection : List<EyeColor> { }
-}
 
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/Gender.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/Gender.cs
index 23502b658..cb616c03c 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/Gender.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/Gender.cs
@@ -5,42 +5,35 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
-
-namespace Beef.Demo.Common.Entities
+namespace Beef.Demo.Common.Entities;
+
+/// <summary>
+/// Represents the Gender entity.
+/// </summary>
+public partial class Gender : ReferenceDataBase<Guid>
 {
     /// <summary>
-    /// Represents the Gender entity.
+    /// Gets or sets the Alternate Name.
+    /// </summary>
+    public string? AlternateName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Trip OData Code.
     /// </summary>
-    public partial class Gender : ReferenceDataBase<Guid>
-    {
-        /// <summary>
-        /// Gets or sets the Alternate Name.
-        /// </summary>
-        public string? AlternateName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Trip OData Code.
-        /// </summary>
-        [JsonIgnore]
-        public string? TripCode { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Country code.
-        /// </summary>
-        public string? Country { get; set; }
-    }
+    [JsonIgnore]
+    public string? TripCode { get; set; }
 
     /// <summary>
-    /// Represents the <c>Gender</c> collection.
+    /// Gets or sets the Country code.
     /// </summary>
-    public partial class GenderCollection : List<Gender> { }
+    public string? Country { get; set; }
 }
 
+/// <summary>
+/// Represents the <c>Gender</c> collection.
+/// </summary>
+public partial class GenderCollection : List<Gender> { }
+
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/MapArgs.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/MapArgs.cs
index c35b82e60..6db5e5688 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/MapArgs.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/MapArgs.cs
@@ -5,25 +5,19 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
+/// <summary>
+/// Represents the Mapping arguments entity.
+/// </summary>
+public partial class MapArgs
 {
     /// <summary>
-    /// Represents the Mapping arguments entity.
+    /// Gets or sets the Coordinates.
     /// </summary>
-    public partial class MapArgs
-    {
-        /// <summary>
-        /// Gets or sets the Coordinates.
-        /// </summary>
-        public MapCoordinates? Coordinates { get; set; }
-    }
+    public MapCoordinates? Coordinates { get; set; }
 }
 
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/MapCoordinates.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/MapCoordinates.cs
index 2b89dc7cc..01828054a 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/MapCoordinates.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/MapCoordinates.cs
@@ -5,30 +5,24 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
+/// <summary>
+/// Represents the Map Coordinates entity.
+/// </summary>
+public partial class MapCoordinates
 {
     /// <summary>
-    /// Represents the Map Coordinates entity.
+    /// Gets or sets the Latitude.
     /// </summary>
-    public partial class MapCoordinates
-    {
-        /// <summary>
-        /// Gets or sets the Latitude.
-        /// </summary>
-        public decimal Latitude { get; set; }
+    public decimal Latitude { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Longitude.
-        /// </summary>
-        public decimal Longitude { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the Longitude.
+    /// </summary>
+    public decimal Longitude { get; set; }
 }
 
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/Person.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/Person.cs
index 85a48bcf2..fe50f7374 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/Person.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/Person.cs
@@ -5,116 +5,110 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
+/// <summary>
+/// Represents the Person entity.
+/// </summary>
+public partial class Person : IIdentifier<Guid>, IETag, IChangeLog
 {
     /// <summary>
-    /// Represents the Person entity.
-    /// </summary>
-    public partial class Person : IIdentifier<Guid>, IETag, IChangeLog
-    {
-        /// <summary>
-        /// Gets or sets the <c>Person</c> identifier.
-        /// </summary>
-        [System.Xml.Serialization.XmlElement("Id")]
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the First Name.
-        /// </summary>
-        public string? FirstName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Last Name.
-        /// </summary>
-        public string? LastName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Unique Code.
-        /// </summary>
-        public string? UniqueCode { get; set; }
-
-        /// <summary>
-        /// Gets the corresponding <c>Gender</c> text (read-only where selected).
-        /// </summary>
-        public string? GenderText { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Gender code.
-        /// </summary>
-        public string? Gender { get; set; }
-
-        /// <summary>
-        /// Gets the corresponding <c>EyeColor</c> text (read-only where selected).
-        /// </summary>
-        public string? EyeColorText { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Eye Color code.
-        /// </summary>
-        public string? EyeColor { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Birthday.
-        /// </summary>
-        public DateTime Birthday { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Address.
-        /// </summary>
-        public Address? Address { get; set; }
-
-        /// <summary>
-        /// Gets or sets the ETag.
-        /// </summary>
-        [JsonPropertyName("etag")]
-        public string? ETag { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Metadata.
-        /// </summary>
-        public Dictionary<string, string>? Metadata { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Change Log.
-        /// </summary>
-        public ChangeLog? ChangeLog { get; set; }
-    }
-
-    /// <summary>
-    /// Represents the <c>Person</c> collection.
-    /// </summary>
-    public partial class PersonCollection : List<Person> { }
-
-    /// <summary>
-    /// Represents the <c>Person</c> collection result.
-    /// </summary>
-    public class PersonCollectionResult : CollectionResult<PersonCollection, Person>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PersonCollectionResult"/> class.
-        /// </summary>
-        public PersonCollectionResult() { }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PersonCollectionResult"/> class with <paramref name="paging"/>.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public PersonCollectionResult(PagingArgs? paging) : base(paging) { }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PersonCollectionResult"/> class with <paramref name="items"/> to add.
-        /// </summary>
-        /// <param name="items">The items to add.</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public PersonCollectionResult(IEnumerable<Person> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
-    }
+    /// Gets or sets the <c>Person</c> identifier.
+    /// </summary>
+    [System.Xml.Serialization.XmlElement("Id")]
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// Gets or sets the First Name.
+    /// </summary>
+    public string? FirstName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Last Name.
+    /// </summary>
+    public string? LastName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Unique Code.
+    /// </summary>
+    public string? UniqueCode { get; set; }
+
+    /// <summary>
+    /// Gets the corresponding <c>Gender</c> text (read-only where selected).
+    /// </summary>
+    public string? GenderText { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Gender code.
+    /// </summary>
+    public string? Gender { get; set; }
+
+    /// <summary>
+    /// Gets the corresponding <c>EyeColor</c> text (read-only where selected).
+    /// </summary>
+    public string? EyeColorText { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Eye Color code.
+    /// </summary>
+    public string? EyeColor { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Birthday.
+    /// </summary>
+    public DateTime Birthday { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Address.
+    /// </summary>
+    public Address? Address { get; set; }
+
+    /// <summary>
+    /// Gets or sets the ETag.
+    /// </summary>
+    [JsonPropertyName("etag")]
+    public string? ETag { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Metadata.
+    /// </summary>
+    public Dictionary<string, string>? Metadata { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Change Log.
+    /// </summary>
+    public ChangeLog? ChangeLog { get; set; }
+}
+
+/// <summary>
+/// Represents the <c>Person</c> collection.
+/// </summary>
+public partial class PersonCollection : List<Person> { }
+
+/// <summary>
+/// Represents the <c>Person</c> collection result.
+/// </summary>
+public class PersonCollectionResult : CollectionResult<PersonCollection, Person>
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PersonCollectionResult"/> class.
+    /// </summary>
+    public PersonCollectionResult() { }
+    
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PersonCollectionResult"/> class with <paramref name="paging"/>.
+    /// </summary>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public PersonCollectionResult(PagingArgs? paging) : base(paging) { }
+    
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PersonCollectionResult"/> class with <paramref name="items"/> to add.
+    /// </summary>
+    /// <param name="items">The items to add.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public PersonCollectionResult(IEnumerable<Person> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
 }
 
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonArgs.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonArgs.cs
index c68287e84..7b3208065 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonArgs.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonArgs.cs
@@ -5,40 +5,34 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
+/// <summary>
+/// Represents the <c>Person</c> arguments entity.
+/// </summary>
+public partial class PersonArgs
 {
     /// <summary>
-    /// Represents the <c>Person</c> arguments entity.
+    /// Gets or sets the First Name.
     /// </summary>
-    public partial class PersonArgs
-    {
-        /// <summary>
-        /// Gets or sets the First Name.
-        /// </summary>
-        public string? FirstName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Last Name.
-        /// </summary>
-        public string? LastName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Genders code(s).
-        /// </summary>
-        public List<string?>? Genders { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Order By.
-        /// </summary>
-        public Common.Entities.OrderBy? OrderBy { get; set; }
-    }
+    public string? FirstName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Last Name.
+    /// </summary>
+    public string? LastName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Genders code(s).
+    /// </summary>
+    public List<string?>? Genders { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Order By.
+    /// </summary>
+    public Common.Entities.OrderBy? OrderBy { get; set; }
 }
 
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonDetail.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonDetail.cs
index b369ce766..126ede27f 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonDetail.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonDetail.cs
@@ -5,54 +5,48 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
+/// <summary>
+/// Represents the <c>Person</c> detail entity.
+/// </summary>
+public partial class PersonDetail : Person
 {
     /// <summary>
-    /// Represents the <c>Person</c> detail entity.
+    /// Gets or sets the History.
     /// </summary>
-    public partial class PersonDetail : Person
-    {
-        /// <summary>
-        /// Gets or sets the History.
-        /// </summary>
-        public WorkHistoryCollection? History { get; set; }
-    }
+    public WorkHistoryCollection? History { get; set; }
+}
+
+/// <summary>
+/// Represents the <c>PersonDetail</c> collection.
+/// </summary>
+public partial class PersonDetailCollection : List<PersonDetail> { }
 
+/// <summary>
+/// Represents the <c>PersonDetail</c> collection result.
+/// </summary>
+public class PersonDetailCollectionResult : CollectionResult<PersonDetailCollection, PersonDetail>
+{
     /// <summary>
-    /// Represents the <c>PersonDetail</c> collection.
+    /// Initializes a new instance of the <see cref="PersonDetailCollectionResult"/> class.
     /// </summary>
-    public partial class PersonDetailCollection : List<PersonDetail> { }
-
+    public PersonDetailCollectionResult() { }
+    
     /// <summary>
-    /// Represents the <c>PersonDetail</c> collection result.
+    /// Initializes a new instance of the <see cref="PersonDetailCollectionResult"/> class with <paramref name="paging"/>.
     /// </summary>
-    public class PersonDetailCollectionResult : CollectionResult<PersonDetailCollection, PersonDetail>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PersonDetailCollectionResult"/> class.
-        /// </summary>
-        public PersonDetailCollectionResult() { }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PersonDetailCollectionResult"/> class with <paramref name="paging"/>.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public PersonDetailCollectionResult(PagingArgs? paging) : base(paging) { }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PersonDetailCollectionResult"/> class with <paramref name="items"/> to add.
-        /// </summary>
-        /// <param name="items">The items to add.</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public PersonDetailCollectionResult(IEnumerable<PersonDetail> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
-    }
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public PersonDetailCollectionResult(PagingArgs? paging) : base(paging) { }
+    
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PersonDetailCollectionResult"/> class with <paramref name="items"/> to add.
+    /// </summary>
+    /// <param name="items">The items to add.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public PersonDetailCollectionResult(IEnumerable<PersonDetail> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
 }
 
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonOther.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonOther.cs
index d1923055e..eabb7264a 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonOther.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonOther.cs
@@ -5,51 +5,45 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
+/// <summary>
+/// Represents the other <c>Person</c> without <c>EntityBase</c> capabilities entity.
+/// </summary>
+public partial class PersonOther : IIdentifier<Guid>, IETag, IChangeLog
 {
     /// <summary>
-    /// Represents the other <c>Person</c> without <c>EntityBase</c> capabilities entity.
+    /// Gets or sets the <c>Person</c> identifier.
     /// </summary>
-    public partial class PersonOther : IIdentifier<Guid>, IETag, IChangeLog
-    {
-        /// <summary>
-        /// Gets or sets the <c>Person</c> identifier.
-        /// </summary>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the First Name.
-        /// </summary>
-        public string? FirstName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Last Name.
-        /// </summary>
-        public string? LastName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the ETag.
-        /// </summary>
-        [JsonPropertyName("etag")]
-        public string? ETag { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Change Log.
-        /// </summary>
-        public ChangeLog? ChangeLog { get; set; }
-    }
+    public Guid Id { get; set; }
 
     /// <summary>
-    /// Represents the <c>PersonOther</c> collection.
+    /// Gets or sets the First Name.
     /// </summary>
-    public partial class PersonOtherCollection : List<PersonOther> { }
+    public string? FirstName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Last Name.
+    /// </summary>
+    public string? LastName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the ETag.
+    /// </summary>
+    [JsonPropertyName("etag")]
+    public string? ETag { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Change Log.
+    /// </summary>
+    public ChangeLog? ChangeLog { get; set; }
 }
 
+/// <summary>
+/// Represents the <c>PersonOther</c> collection.
+/// </summary>
+public partial class PersonOtherCollection : List<PersonOther> { }
+
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/PlaceInfo.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/PlaceInfo.cs
index f2406e39d..524240ffb 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/PlaceInfo.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/PlaceInfo.cs
@@ -5,35 +5,29 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
+/// <summary>
+/// Represents the Place Info entity.
+/// </summary>
+public partial class PlaceInfo
 {
     /// <summary>
-    /// Represents the Place Info entity.
+    /// Gets or sets the Name.
     /// </summary>
-    public partial class PlaceInfo
-    {
-        /// <summary>
-        /// Gets or sets the Name.
-        /// </summary>
-        public string? Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Post Code.
-        /// </summary>
-        public string? PostCode { get; set; }
-    }
+    public string? Name { get; set; }
 
     /// <summary>
-    /// Represents the <c>PlaceInfo</c> collection.
+    /// Gets or sets the Post Code.
     /// </summary>
-    public partial class PlaceInfoCollection : List<PlaceInfo> { }
+    public string? PostCode { get; set; }
 }
 
+/// <summary>
+/// Represents the <c>PlaceInfo</c> collection.
+/// </summary>
+public partial class PlaceInfoCollection : List<PlaceInfo> { }
+
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/PostalInfo.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/PostalInfo.cs
index 97db3849e..4eb251460 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/PostalInfo.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/PostalInfo.cs
@@ -5,45 +5,39 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
+/// <summary>
+/// Represents the Postal Info entity.
+/// </summary>
+public partial class PostalInfo
 {
     /// <summary>
-    /// Represents the Postal Info entity.
+    /// Gets the corresponding <c>Country</c> text (read-only where selected).
     /// </summary>
-    public partial class PostalInfo
-    {
-        /// <summary>
-        /// Gets the corresponding <c>Country</c> text (read-only where selected).
-        /// </summary>
-        public string? CountryText { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Country code.
-        /// </summary>
-        public string? Country { get; set; }
-
-        /// <summary>
-        /// Gets or sets the City.
-        /// </summary>
-        public string? City { get; set; }
-
-        /// <summary>
-        /// Gets or sets the State.
-        /// </summary>
-        public string? State { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Places.
-        /// </summary>
-        public PlaceInfoCollection? Places { get; set; }
-    }
+    public string? CountryText { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Country code.
+    /// </summary>
+    public string? Country { get; set; }
+
+    /// <summary>
+    /// Gets or sets the City.
+    /// </summary>
+    public string? City { get; set; }
+
+    /// <summary>
+    /// Gets or sets the State.
+    /// </summary>
+    public string? State { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Places.
+    /// </summary>
+    public PlaceInfoCollection? Places { get; set; }
 }
 
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/PowerSource.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/PowerSource.cs
index 74ba69255..f7902dc35 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/PowerSource.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/PowerSource.cs
@@ -5,31 +5,24 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
+/// <summary>
+/// Represents the Power Source entity.
+/// </summary>
+public partial class PowerSource : ReferenceDataBase<Guid>
 {
     /// <summary>
-    /// Represents the Power Source entity.
+    /// Gets or sets the Additional Info.
     /// </summary>
-    public partial class PowerSource : ReferenceDataBase<Guid>
-    {
-        /// <summary>
-        /// Gets or sets the Additional Info.
-        /// </summary>
-        public string? AdditionalInfo { get; set; }
-    }
-
-    /// <summary>
-    /// Represents the <c>PowerSource</c> collection.
-    /// </summary>
-    public partial class PowerSourceCollection : List<PowerSource> { }
+    public string? AdditionalInfo { get; set; }
 }
 
+/// <summary>
+/// Represents the <c>PowerSource</c> collection.
+/// </summary>
+public partial class PowerSourceCollection : List<PowerSource> { }
+
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/ProductArgs.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/ProductArgs.cs
index 968698e7d..00ff4117c 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/ProductArgs.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/ProductArgs.cs
@@ -5,30 +5,24 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
+/// <summary>
+/// The <c>Product</c> arguments.
+/// </summary>
+public partial class ProductArgs
 {
     /// <summary>
-    /// The <c>Product</c> arguments.
+    /// The product name.
     /// </summary>
-    public partial class ProductArgs
-    {
-        /// <summary>
-        /// The product name.
-        /// </summary>
-        public string? Name { get; set; }
+    public string? Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Description.
-        /// </summary>
-        public string? Description { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the Description.
+    /// </summary>
+    public string? Description { get; set; }
 }
 
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/RefDataPrimaryKey.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/RefDataPrimaryKey.cs
index 3489c6bee..6bcc21808 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/RefDataPrimaryKey.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/RefDataPrimaryKey.cs
@@ -5,48 +5,42 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
+/// <summary>
+/// Represents the Ref Data Primary Key entity.
+/// </summary>
+public partial class RefDataPrimaryKey : IPrimaryKey
 {
     /// <summary>
-    /// Represents the Ref Data Primary Key entity.
+    /// Gets the corresponding <c>Key1</c> text (read-only where selected).
     /// </summary>
-    public partial class RefDataPrimaryKey : IPrimaryKey
-    {
-        /// <summary>
-        /// Gets the corresponding <c>Key1</c> text (read-only where selected).
-        /// </summary>
-        public string? Key1Text { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Key1 code.
-        /// </summary>
-        public string? Key1 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Other.
-        /// </summary>
-        public string? Other { get; set; }
+    public string? Key1Text { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Key1 code.
+    /// </summary>
+    public string? Key1 { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Other.
+    /// </summary>
+    public string? Other { get; set; }
         
-        /// <summary>
-        /// Creates the primary <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <returns>The primary <see cref="CompositeKey"/>.</returns>
-        /// <param name="key1">The <see cref="Key1"/>.</param>
+    /// <summary>
+    /// Creates the primary <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <returns>The primary <see cref="CompositeKey"/>.</returns>
+    /// <param name="key1">The <see cref="Key1"/>.</param>
         public static CompositeKey CreatePrimaryKey(string? key1) => CompositeKey.Create(key1);
 
-        /// <summary>
-        /// Gets the primary <see cref="CompositeKey"/> (consists of the following property(s): <see cref="Key1"/>).
-        /// </summary>
-        [JsonIgnore]
-        public CompositeKey PrimaryKey => CreatePrimaryKey(Key1);
-    }
+    /// <summary>
+    /// Gets the primary <see cref="CompositeKey"/> (consists of the following property(s): <see cref="Key1"/>).
+    /// </summary>
+    [JsonIgnore]
+    public CompositeKey PrimaryKey => CreatePrimaryKey(Key1);
 }
 
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/Robot.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/Robot.cs
index deeb9cd72..109065df1 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/Robot.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/Robot.cs
@@ -5,95 +5,89 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
+/// <summary>
+/// Represents the Robot entity.
+/// </summary>
+public partial class Robot : IIdentifier<Guid>, IETag, IChangeLog
 {
     /// <summary>
-    /// Represents the Robot entity.
+    /// Gets or sets the <c>Robot</c> identifier.
     /// </summary>
-    public partial class Robot : IIdentifier<Guid>, IETag, IChangeLog
-    {
-        /// <summary>
-        /// Gets or sets the <c>Robot</c> identifier.
-        /// </summary>
-        public Guid Id { get; set; }
+    public Guid Id { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Model number.
-        /// </summary>
-        public string? ModelNo { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Unique serial number.
-        /// </summary>
-        public string? SerialNo { get; set; }
+    /// <summary>
+    /// Gets or sets the Model number.
+    /// </summary>
+    public string? ModelNo { get; set; }
 
-        /// <summary>
-        /// Gets the corresponding <c>EyeColor</c> text (read-only where selected).
-        /// </summary>
-        public string? EyeColorText { get; set; }
+    /// <summary>
+    /// Gets or sets the Unique serial number.
+    /// </summary>
+    public string? SerialNo { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Eye Color code.
-        /// </summary>
-        public string? EyeColor { get; set; }
+    /// <summary>
+    /// Gets the corresponding <c>EyeColor</c> text (read-only where selected).
+    /// </summary>
+    public string? EyeColorText { get; set; }
 
-        /// <summary>
-        /// Gets the corresponding <c>PowerSource</c> text (read-only where selected).
-        /// </summary>
-        public string? PowerSourceText { get; set; }
+    /// <summary>
+    /// Gets or sets the Eye Color code.
+    /// </summary>
+    public string? EyeColor { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Power Source code.
-        /// </summary>
-        public string? PowerSource { get; set; }
+    /// <summary>
+    /// Gets the corresponding <c>PowerSource</c> text (read-only where selected).
+    /// </summary>
+    public string? PowerSourceText { get; set; }
 
-        /// <summary>
-        /// Gets or sets the ETag.
-        /// </summary>
-        [JsonPropertyName("etag")]
-        public string? ETag { get; set; }
+    /// <summary>
+    /// Gets or sets the Power Source code.
+    /// </summary>
+    public string? PowerSource { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Change Log.
-        /// </summary>
-        public ChangeLog? ChangeLog { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the ETag.
+    /// </summary>
+    [JsonPropertyName("etag")]
+    public string? ETag { get; set; }
 
     /// <summary>
-    /// Represents the <c>Robot</c> collection.
+    /// Gets or sets the Change Log.
     /// </summary>
-    public partial class RobotCollection : List<Robot> { }
+    public ChangeLog? ChangeLog { get; set; }
+}
+
+/// <summary>
+/// Represents the <c>Robot</c> collection.
+/// </summary>
+public partial class RobotCollection : List<Robot> { }
 
+/// <summary>
+/// Represents the <c>Robot</c> collection result.
+/// </summary>
+public class RobotCollectionResult : CollectionResult<RobotCollection, Robot>
+{
     /// <summary>
-    /// Represents the <c>Robot</c> collection result.
+    /// Initializes a new instance of the <see cref="RobotCollectionResult"/> class.
     /// </summary>
-    public class RobotCollectionResult : CollectionResult<RobotCollection, Robot>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RobotCollectionResult"/> class.
-        /// </summary>
-        public RobotCollectionResult() { }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RobotCollectionResult"/> class with <paramref name="paging"/>.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public RobotCollectionResult(PagingArgs? paging) : base(paging) { }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RobotCollectionResult"/> class with <paramref name="items"/> to add.
-        /// </summary>
-        /// <param name="items">The items to add.</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public RobotCollectionResult(IEnumerable<Robot> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
-    }
+    public RobotCollectionResult() { }
+    
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RobotCollectionResult"/> class with <paramref name="paging"/>.
+    /// </summary>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public RobotCollectionResult(PagingArgs? paging) : base(paging) { }
+    
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RobotCollectionResult"/> class with <paramref name="items"/> to add.
+    /// </summary>
+    /// <param name="items">The items to add.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public RobotCollectionResult(IEnumerable<Robot> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
 }
 
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/RobotArgs.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/RobotArgs.cs
index bfe4e0f3d..678c147fa 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/RobotArgs.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/RobotArgs.cs
@@ -5,38 +5,32 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
+/// <summary>
+/// Represents the <c>Robot</c> arguments entity.
+/// </summary>
+public partial class RobotArgs
 {
     /// <summary>
-    /// Represents the <c>Robot</c> arguments entity.
+    /// Gets or sets the Model number.
     /// </summary>
-    public partial class RobotArgs
-    {
-        /// <summary>
-        /// Gets or sets the Model number.
-        /// </summary>
-        [JsonPropertyName("model-no")]
-        public string? ModelNo { get; set; }
+    [JsonPropertyName("model-no")]
+    public string? ModelNo { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Unique serial number.
-        /// </summary>
-        [JsonPropertyName("serial-no")]
-        public string? SerialNo { get; set; }
+    /// <summary>
+    /// Gets or sets the Unique serial number.
+    /// </summary>
+    [JsonPropertyName("serial-no")]
+    public string? SerialNo { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Power Sources code(s).
-        /// </summary>
-        [JsonPropertyName("power-sources")]
-        public List<string?>? PowerSources { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the Power Sources code(s).
+    /// </summary>
+    [JsonPropertyName("power-sources")]
+    public List<string?>? PowerSources { get; set; }
 }
 
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/Status.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/Status.cs
index 76aab6075..2b5b7f7b3 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/Status.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/Status.cs
@@ -5,25 +5,18 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
-{
-    /// <summary>
-    /// Represents the Status entity.
-    /// </summary>
-    public partial class Status : ReferenceDataBase<string?> { }
+/// <summary>
+/// Represents the Status entity.
+/// </summary>
+public partial class Status : ReferenceDataBase<string?> { }
+
+/// <summary>
+/// Represents the <c>Status</c> collection.
+/// </summary>
+public partial class StatusCollection : List<Status> { }
 
-    /// <summary>
-    /// Represents the <c>Status</c> collection.
-    /// </summary>
-    public partial class StatusCollection : List<Status> { }
-}
 
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/USState.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/USState.cs
index 1d0d270b1..2e8265998 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/USState.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/USState.cs
@@ -5,25 +5,18 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
-{
-    /// <summary>
-    /// Represents the US State entity.
-    /// </summary>
-    public partial class USState : ReferenceDataBase<Guid> { }
+/// <summary>
+/// Represents the US State entity.
+/// </summary>
+public partial class USState : ReferenceDataBase<Guid> { }
+
+/// <summary>
+/// Represents the <c>USState</c> collection.
+/// </summary>
+public partial class USStateCollection : List<USState> { }
 
-    /// <summary>
-    /// Represents the <c>USState</c> collection.
-    /// </summary>
-    public partial class USStateCollection : List<USState> { }
-}
 
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/WorkHistory.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/WorkHistory.cs
index d5480cde4..eedc7d643 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/WorkHistory.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/WorkHistory.cs
@@ -5,60 +5,54 @@
 #nullable enable
 #pragma warning disable
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace Beef.Demo.Common.Entities;
 
-namespace Beef.Demo.Common.Entities
+/// <summary>
+/// Represents the Work History entity.
+/// </summary>
+public partial class WorkHistory : IPrimaryKey
 {
     /// <summary>
-    /// Represents the Work History entity.
+    /// Gets or sets the <c>Person</c> identifier (not serialized/read-only for internal data merging).
     /// </summary>
-    public partial class WorkHistory : IPrimaryKey
-    {
-        /// <summary>
-        /// Gets or sets the <c>Person</c> identifier (not serialized/read-only for internal data merging).
-        /// </summary>
-        [JsonIgnore]
-        public Guid PersonId { get; set; }
+    [JsonIgnore]
+    public Guid PersonId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Name.
-        /// </summary>
-        [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-        public string? Name { get; set; }
+    /// <summary>
+    /// Gets or sets the Name.
+    /// </summary>
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
+    public string? Name { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Start Date.
-        /// </summary>
-        public DateTime StartDate { get; set; }
+    /// <summary>
+    /// Gets or sets the Start Date.
+    /// </summary>
+    public DateTime StartDate { get; set; }
 
-        /// <summary>
-        /// Gets or sets the End Date.
-        /// </summary>
-        public DateTime? EndDate { get; set; }
+    /// <summary>
+    /// Gets or sets the End Date.
+    /// </summary>
+    public DateTime? EndDate { get; set; }
         
-        /// <summary>
-        /// Creates the primary <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <returns>The primary <see cref="CompositeKey"/>.</returns>
-        /// <param name="name">The <see cref="Name"/>.</param>
+    /// <summary>
+    /// Creates the primary <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <returns>The primary <see cref="CompositeKey"/>.</returns>
+    /// <param name="name">The <see cref="Name"/>.</param>
         public static CompositeKey CreatePrimaryKey(string? name) => CompositeKey.Create(name);
 
-        /// <summary>
-        /// Gets the primary <see cref="CompositeKey"/> (consists of the following property(s): <see cref="Name"/>).
-        /// </summary>
-        [JsonIgnore]
-        public CompositeKey PrimaryKey => CreatePrimaryKey(Name);
-    }
-
     /// <summary>
-    /// Represents the <c>WorkHistory</c> collection.
+    /// Gets the primary <see cref="CompositeKey"/> (consists of the following property(s): <see cref="Name"/>).
     /// </summary>
-    public partial class WorkHistoryCollection : List<WorkHistory> { }
+    [JsonIgnore]
+    public CompositeKey PrimaryKey => CreatePrimaryKey(Name);
 }
 
+/// <summary>
+/// Represents the <c>WorkHistory</c> collection.
+/// </summary>
+public partial class WorkHistoryCollection : List<WorkHistory> { }
+
+
 #pragma warning restore
 #nullable restore
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/GlobalUsings.cs b/samples/Demo/Beef.Demo.Common/GlobalUsings.cs
new file mode 100644
index 000000000..b3f685a1c
--- /dev/null
+++ b/samples/Demo/Beef.Demo.Common/GlobalUsings.cs
@@ -0,0 +1,13 @@
+global using CoreEx.Entities;
+global using CoreEx.Http;
+global using CoreEx.Json;
+global using CoreEx.RefData;
+global using System;
+global using System.Collections.Generic;
+global using System.Diagnostics.CodeAnalysis;
+global using System.Text.Json.Serialization;
+global using System.Net.Http;
+global using System.Threading;
+global using System.Threading.Tasks;
+global using Beef.Demo.Common.Entities;
+global using RefDataNamespace = Beef.Demo.Common.Entities;
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Common/Agents/Generated/EmployeeAgent.cs b/samples/My.Hr/My.Hr.Common/Agents/Generated/EmployeeAgent.cs
index d6e6ea1a6..133ca5159 100644
--- a/samples/My.Hr/My.Hr.Common/Agents/Generated/EmployeeAgent.cs
+++ b/samples/My.Hr/My.Hr.Common/Agents/Generated/EmployeeAgent.cs
@@ -2,58 +2,46 @@
  * This file is automatically generated; any changes will be lost.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using My.Hr.Common.Entities;
-using RefDataNamespace = My.Hr.Common.Entities;
-
-namespace My.Hr.Common.Agents
+namespace My.Hr.Common.Agents;
+
+/// <summary>
+/// Provides the <see cref="Employee"/> HTTP agent.
+/// </summary>
+public partial class EmployeeAgent : TypedHttpClientBase<EmployeeAgent>, IEmployeeAgent
 {
     /// <summary>
-    /// Provides the <see cref="Employee"/> HTTP agent.
+    /// Initializes a new instance of the <see cref="EmployeeAgent"/> class.
     /// </summary>
-    public partial class EmployeeAgent : TypedHttpClientBase<EmployeeAgent>, IEmployeeAgent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EmployeeAgent"/> class.
-        /// </summary>
-        /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
-        /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
-        public EmployeeAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Employee?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<Employee?>("employees/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Employee>> CreateAsync(Employee value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync<Employee, Employee>("employees", value, requestOptions: requestOptions, cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Employee>> UpdateAsync(Employee value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PutAsync<Employee, Employee>("employees/{id}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Employee>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PatchAsync<Employee>("employees/{id}", patchOption, value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => DeleteAsync("employees/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<EmployeeBaseCollectionResult>> GetByArgsAsync(EmployeeArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<EmployeeBaseCollectionResult>("employees", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(new HttpArg<EmployeeArgs?>("args", args, HttpArgType.FromUriUseProperties)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Employee>> TerminateAsync(TerminationDetail value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync<TerminationDetail, Employee>("employees/{id}/terminate", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-    }
+    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
+    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
+    /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
+    public EmployeeAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Employee?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<Employee?>("employees/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Employee>> CreateAsync(Employee value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync<Employee, Employee>("employees", value, requestOptions: requestOptions, cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Employee>> UpdateAsync(Employee value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PutAsync<Employee, Employee>("employees/{id}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Employee>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PatchAsync<Employee>("employees/{id}", patchOption, value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => DeleteAsync("employees/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<EmployeeBaseCollectionResult>> GetByArgsAsync(EmployeeArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<EmployeeBaseCollectionResult>("employees", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(new HttpArg<EmployeeArgs?>("args", args, HttpArgType.FromUriUseProperties)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Employee>> TerminateAsync(TerminationDetail value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync<TerminationDetail, Employee>("employees/{id}/terminate", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
 }
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Common/Agents/Generated/IEmployeeAgent.cs b/samples/My.Hr/My.Hr.Common/Agents/Generated/IEmployeeAgent.cs
index 5a16b3559..91be2dced 100644
--- a/samples/My.Hr/My.Hr.Common/Agents/Generated/IEmployeeAgent.cs
+++ b/samples/My.Hr/My.Hr.Common/Agents/Generated/IEmployeeAgent.cs
@@ -2,92 +2,78 @@
  * This file is automatically generated; any changes will be lost.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using Microsoft.Extensions.Logging;
-using My.Hr.Common.Entities;
-using RefDataNamespace = My.Hr.Common.Entities;
+namespace My.Hr.Common.Agents;
 
-namespace My.Hr.Common.Agents
+/// <summary>
+/// Defines the <see cref="Employee"/> HTTP agent.
+/// </summary>
+public partial interface IEmployeeAgent
 {
     /// <summary>
-    /// Defines the <see cref="Employee"/> HTTP agent.
+    /// Gets the specified <see cref="Employee"/>.
     /// </summary>
-    public partial interface IEmployeeAgent
-    {
-        /// <summary>
-        /// Gets the specified <see cref="Employee"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="Employee"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Employee?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <param name="id">The <see cref="Employee"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Employee?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Creates a new <see cref="Employee"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="Employee"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Employee>> CreateAsync(Employee value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Creates a new <see cref="Employee"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="Employee"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Employee>> CreateAsync(Employee value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Updates an existing <see cref="Employee"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="Employee"/>.</param>
-        /// <param name="id">The <see cref="Employee"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Employee>> UpdateAsync(Employee value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Updates an existing <see cref="Employee"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="Employee"/>.</param>
+    /// <param name="id">The <see cref="Employee"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Employee>> UpdateAsync(Employee value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Patches an existing <see cref="Employee"/>.
-        /// </summary>
-        /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
-        /// <param name="value">The <see cref="string"/> that contains the patch content for the <see cref="Employee"/>.</param>
-        /// <param name="id">The <see cref="Employee"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Employee>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Patches an existing <see cref="Employee"/>.
+    /// </summary>
+    /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
+    /// <param name="value">The <see cref="string"/> that contains the patch content for the <see cref="Employee"/>.</param>
+    /// <param name="id">The <see cref="Employee"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Employee>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Deletes the specified <see cref="Employee"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="Employee"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Deletes the specified <see cref="Employee"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="Employee"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets the <see cref="EmployeeBaseCollectionResult"/> that contains the items that match the selection criteria.
-        /// </summary>
-        /// <param name="args">The Args (see <see cref="EmployeeArgs"/>).</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<EmployeeBaseCollectionResult>> GetByArgsAsync(EmployeeArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets the <see cref="EmployeeBaseCollectionResult"/> that contains the items that match the selection criteria.
+    /// </summary>
+    /// <param name="args">The Args (see <see cref="EmployeeArgs"/>).</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<EmployeeBaseCollectionResult>> GetByArgsAsync(EmployeeArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Terminates an existing <see cref="Employee"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="TerminationDetail"/>.</param>
-        /// <param name="id">The <see cref="Employee"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Employee>> TerminateAsync(TerminationDetail value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-    }
+    /// <summary>
+    /// Terminates an existing <see cref="Employee"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="TerminationDetail"/>.</param>
+    /// <param name="id">The <see cref="Employee"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Employee>> TerminateAsync(TerminationDetail value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Common/Agents/Generated/IPerformanceReviewAgent.cs b/samples/My.Hr/My.Hr.Common/Agents/Generated/IPerformanceReviewAgent.cs
index a8adacc02..8b80f981a 100644
--- a/samples/My.Hr/My.Hr.Common/Agents/Generated/IPerformanceReviewAgent.cs
+++ b/samples/My.Hr/My.Hr.Common/Agents/Generated/IPerformanceReviewAgent.cs
@@ -2,83 +2,69 @@
  * This file is automatically generated; any changes will be lost.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using Microsoft.Extensions.Logging;
-using My.Hr.Common.Entities;
-using RefDataNamespace = My.Hr.Common.Entities;
+namespace My.Hr.Common.Agents;
 
-namespace My.Hr.Common.Agents
+/// <summary>
+/// Defines the <see cref="PerformanceReview"/> HTTP agent.
+/// </summary>
+public partial interface IPerformanceReviewAgent
 {
     /// <summary>
-    /// Defines the <see cref="PerformanceReview"/> HTTP agent.
+    /// Gets the specified <see cref="PerformanceReview"/>.
     /// </summary>
-    public partial interface IPerformanceReviewAgent
-    {
-        /// <summary>
-        /// Gets the specified <see cref="PerformanceReview"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="Employee"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PerformanceReview?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <param name="id">The <see cref="Employee"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PerformanceReview?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets the <see cref="PerformanceReviewCollectionResult"/> that contains the items that match the selection criteria.
-        /// </summary>
-        /// <param name="employeeId">The <see cref="Employee.Id"/>.</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PerformanceReviewCollectionResult>> GetByEmployeeIdAsync(Guid employeeId, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets the <see cref="PerformanceReviewCollectionResult"/> that contains the items that match the selection criteria.
+    /// </summary>
+    /// <param name="employeeId">The <see cref="Employee.Id"/>.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PerformanceReviewCollectionResult>> GetByEmployeeIdAsync(Guid employeeId, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Creates a new <see cref="PerformanceReview"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="PerformanceReview"/>.</param>
-        /// <param name="employeeId">The <see cref="Employee.Id"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PerformanceReview>> CreateAsync(PerformanceReview value, Guid employeeId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Creates a new <see cref="PerformanceReview"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="PerformanceReview"/>.</param>
+    /// <param name="employeeId">The <see cref="Employee.Id"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PerformanceReview>> CreateAsync(PerformanceReview value, Guid employeeId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Updates an existing <see cref="PerformanceReview"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="PerformanceReview"/>.</param>
-        /// <param name="id">The <see cref="Employee"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PerformanceReview>> UpdateAsync(PerformanceReview value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Updates an existing <see cref="PerformanceReview"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="PerformanceReview"/>.</param>
+    /// <param name="id">The <see cref="Employee"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PerformanceReview>> UpdateAsync(PerformanceReview value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Patches an existing <see cref="PerformanceReview"/>.
-        /// </summary>
-        /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
-        /// <param name="value">The <see cref="string"/> that contains the patch content for the <see cref="PerformanceReview"/>.</param>
-        /// <param name="id">The <see cref="Employee"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PerformanceReview>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Patches an existing <see cref="PerformanceReview"/>.
+    /// </summary>
+    /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
+    /// <param name="value">The <see cref="string"/> that contains the patch content for the <see cref="PerformanceReview"/>.</param>
+    /// <param name="id">The <see cref="Employee"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PerformanceReview>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Deletes the specified <see cref="PerformanceReview"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="Employee"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-    }
+    /// <summary>
+    /// Deletes the specified <see cref="PerformanceReview"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="Employee"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Common/Agents/Generated/IReferenceDataAgent.cs b/samples/My.Hr/My.Hr.Common/Agents/Generated/IReferenceDataAgent.cs
index a20f6c9a9..c02b00232 100644
--- a/samples/My.Hr/My.Hr.Common/Agents/Generated/IReferenceDataAgent.cs
+++ b/samples/My.Hr/My.Hr.Common/Agents/Generated/IReferenceDataAgent.cs
@@ -2,80 +2,65 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using CoreEx.RefData;
-using Microsoft.Extensions.Logging;
-using My.Hr.Common.Entities;
-using RefDataNamespace = My.Hr.Common.Entities;
+namespace My.Hr.Common.Agents;
 
-namespace My.Hr.Common.Agents
+/// <summary>
+/// Defines the <b>ReferenceData</b> HTTP agent.
+/// </summary>
+public partial interface IReferenceDataAgent
 {
     /// <summary>
-    /// Defines the <b>ReferenceData</b> HTTP agent.
+    /// Gets all of the <see cref="RefDataNamespace.Gender"/> items that match the filter arguments.
     /// </summary>
-    public partial interface IReferenceDataAgent
-    {
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.Gender"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.GenderCollection>> GenderGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.GenderCollection>> GenderGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.TerminationReason"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.TerminationReasonCollection>> TerminationReasonGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets all of the <see cref="RefDataNamespace.TerminationReason"/> items that match the filter arguments.
+    /// </summary>
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.TerminationReasonCollection>> TerminationReasonGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.RelationshipType"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.RelationshipTypeCollection>> RelationshipTypeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets all of the <see cref="RefDataNamespace.RelationshipType"/> items that match the filter arguments.
+    /// </summary>
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.RelationshipTypeCollection>> RelationshipTypeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.USState"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.USStateCollection>> USStateGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets all of the <see cref="RefDataNamespace.USState"/> items that match the filter arguments.
+    /// </summary>
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.USStateCollection>> USStateGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.PerformanceOutcome"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.PerformanceOutcomeCollection>> PerformanceOutcomeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets all of the <see cref="RefDataNamespace.PerformanceOutcome"/> items that match the filter arguments.
+    /// </summary>
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.PerformanceOutcomeCollection>> PerformanceOutcomeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets the reference data entries for the specified entities and codes from the query string; e.g: ref?entity=codeX,codeY&amp;entity2=codeZ&amp;entity3
-        /// </summary>
-        /// <param name="names">The optional list of reference data names.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        /// <remarks>The reference data objects will need to be manually extracted from the corresponding response content.</remarks>
-        Task<HttpResult> GetNamedAsync(string[] names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-    }
+    /// <summary>
+    /// Gets the reference data entries for the specified entities and codes from the query string; e.g: ref?entity=codeX,codeY&amp;entity2=codeZ&amp;entity3
+    /// </summary>
+    /// <param name="names">The optional list of reference data names.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    /// <remarks>The reference data objects will need to be manually extracted from the corresponding response content.</remarks>
+    Task<HttpResult> GetNamedAsync(string[] names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Common/Agents/Generated/PerformanceReviewAgent.cs b/samples/My.Hr/My.Hr.Common/Agents/Generated/PerformanceReviewAgent.cs
index 30a6de7c8..c73fd1400 100644
--- a/samples/My.Hr/My.Hr.Common/Agents/Generated/PerformanceReviewAgent.cs
+++ b/samples/My.Hr/My.Hr.Common/Agents/Generated/PerformanceReviewAgent.cs
@@ -2,54 +2,42 @@
  * This file is automatically generated; any changes will be lost.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using My.Hr.Common.Entities;
-using RefDataNamespace = My.Hr.Common.Entities;
-
-namespace My.Hr.Common.Agents
+namespace My.Hr.Common.Agents;
+
+/// <summary>
+/// Provides the <see cref="PerformanceReview"/> HTTP agent.
+/// </summary>
+public partial class PerformanceReviewAgent : TypedHttpClientBase<PerformanceReviewAgent>, IPerformanceReviewAgent
 {
     /// <summary>
-    /// Provides the <see cref="PerformanceReview"/> HTTP agent.
+    /// Initializes a new instance of the <see cref="PerformanceReviewAgent"/> class.
     /// </summary>
-    public partial class PerformanceReviewAgent : TypedHttpClientBase<PerformanceReviewAgent>, IPerformanceReviewAgent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PerformanceReviewAgent"/> class.
-        /// </summary>
-        /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
-        /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
-        public PerformanceReviewAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PerformanceReview?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<PerformanceReview?>("reviews/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PerformanceReviewCollectionResult>> GetByEmployeeIdAsync(Guid employeeId, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<PerformanceReviewCollectionResult>("employees/{employeeId}/reviews", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(new HttpArg<Guid>("employeeId", employeeId)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PerformanceReview>> CreateAsync(PerformanceReview value, Guid employeeId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync<PerformanceReview, PerformanceReview>("employees/{employeeId}/reviews", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("employeeId", employeeId)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PerformanceReview>> UpdateAsync(PerformanceReview value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PutAsync<PerformanceReview, PerformanceReview>("reviews/{id}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PerformanceReview>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PatchAsync<PerformanceReview>("reviews/{id}", patchOption, value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => DeleteAsync("reviews/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-    }
+    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
+    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
+    /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
+    public PerformanceReviewAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PerformanceReview?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<PerformanceReview?>("reviews/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PerformanceReviewCollectionResult>> GetByEmployeeIdAsync(Guid employeeId, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<PerformanceReviewCollectionResult>("employees/{employeeId}/reviews", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(new HttpArg<Guid>("employeeId", employeeId)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PerformanceReview>> CreateAsync(PerformanceReview value, Guid employeeId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync<PerformanceReview, PerformanceReview>("employees/{employeeId}/reviews", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("employeeId", employeeId)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PerformanceReview>> UpdateAsync(PerformanceReview value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PutAsync<PerformanceReview, PerformanceReview>("reviews/{id}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PerformanceReview>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PatchAsync<PerformanceReview>("reviews/{id}", patchOption, value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => DeleteAsync("reviews/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
 }
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Common/Agents/Generated/ReferenceDataAgent.cs b/samples/My.Hr/My.Hr.Common/Agents/Generated/ReferenceDataAgent.cs
index 505b4f5f1..cfb7173b0 100644
--- a/samples/My.Hr/My.Hr.Common/Agents/Generated/ReferenceDataAgent.cs
+++ b/samples/My.Hr/My.Hr.Common/Agents/Generated/ReferenceDataAgent.cs
@@ -2,61 +2,48 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using CoreEx.RefData;
-using My.Hr.Common.Entities;
-using RefDataNamespace = My.Hr.Common.Entities;
-
-namespace My.Hr.Common.Agents
+namespace My.Hr.Common.Agents;
+
+/// <summary>
+/// Provides the <b>ReferenceData</b> HTTP agent.
+/// </summary>
+public partial class ReferenceDataAgent : TypedHttpClientBase<ReferenceDataAgent>, IReferenceDataAgent
 {
     /// <summary>
-    /// Provides the <b>ReferenceData</b> HTTP agent.
+    /// Initializes a new instance of the <see cref="ReferenceDataAgent"/> class.
     /// </summary>
-    public partial class ReferenceDataAgent : TypedHttpClientBase<ReferenceDataAgent>, IReferenceDataAgent
+    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
+    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
+    /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
+    public ReferenceDataAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
+
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.GenderCollection>> GenderGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.GenderCollection>("ref/genders", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.TerminationReasonCollection>> TerminationReasonGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.TerminationReasonCollection>("ref/terminationReasons", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.RelationshipTypeCollection>> RelationshipTypeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.RelationshipTypeCollection>("ref/relationshipTypes", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.USStateCollection>> USStateGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.USStateCollection>("ref/usStates", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.PerformanceOutcomeCollection>> PerformanceOutcomeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.PerformanceOutcomeCollection>("ref/performanceOutcomes", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+
+    /// <inheritdoc/>
+    public Task<HttpResult> GetNamedAsync(string[] names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReferenceDataAgent"/> class.
-        /// </summary>
-        /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
-        /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
-        public ReferenceDataAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
-
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.GenderCollection>> GenderGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.GenderCollection>("ref/genders", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
-
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.TerminationReasonCollection>> TerminationReasonGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.TerminationReasonCollection>("ref/terminationReasons", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
-
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.RelationshipTypeCollection>> RelationshipTypeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.RelationshipTypeCollection>("ref/relationshipTypes", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
-
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.USStateCollection>> USStateGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.USStateCollection>("ref/usStates", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
-
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.PerformanceOutcomeCollection>> PerformanceOutcomeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.PerformanceOutcomeCollection>("ref/performanceOutcomes", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
-
-        /// <inheritdoc/>
-        public Task<HttpResult> GetNamedAsync(string[] names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-        {
-            var ro = requestOptions ?? new HttpRequestOptions();
-            if (names != null)
-                ro.UrlQueryString += string.Join("&", names);
-                
-            return GetAsync("ref", ro, null, cancellationToken);
-        }
+        var ro = requestOptions ?? new HttpRequestOptions();
+        if (names != null)
+            ro.UrlQueryString += string.Join("&", names);
+            
+        return GetAsync("ref", ro, null, cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Common/Entities/Generated/Address.cs b/samples/My.Hr/My.Hr.Common/Entities/Generated/Address.cs
index dff848ba6..3eef386fb 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/Address.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/Address.cs
@@ -2,47 +2,40 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace My.Hr.Common.Entities;
 
-namespace My.Hr.Common.Entities
+/// <summary>
+/// Represents the Address entity.
+/// </summary>
+public partial class Address
 {
     /// <summary>
-    /// Represents the Address entity.
+    /// Gets or sets the Street1.
     /// </summary>
-    public partial class Address
-    {
-        /// <summary>
-        /// Gets or sets the Street1.
-        /// </summary>
-        public string? Street1 { get; set; }
+    public string? Street1 { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Street2.
-        /// </summary>
-        public string? Street2 { get; set; }
+    /// <summary>
+    /// Gets or sets the Street2.
+    /// </summary>
+    public string? Street2 { get; set; }
 
-        /// <summary>
-        /// Gets or sets the City.
-        /// </summary>
-        public string? City { get; set; }
+    /// <summary>
+    /// Gets or sets the City.
+    /// </summary>
+    public string? City { get; set; }
 
-        /// <summary>
-        /// Gets the corresponding <c>State</c> text (read-only where selected).
-        /// </summary>
-        public string? StateText { get; set; }
+    /// <summary>
+    /// Gets the corresponding <c>State</c> text (read-only where selected).
+    /// </summary>
+    public string? StateText { get; set; }
 
-        /// <summary>
-        /// Gets or sets the State code.
-        /// </summary>
-        public string? State { get; set; }
+    /// <summary>
+    /// Gets or sets the State code.
+    /// </summary>
+    public string? State { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Post Code.
-        /// </summary>
-        public string? PostCode { get; set; }
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Gets or sets the Post Code.
+    /// </summary>
+    public string? PostCode { get; set; }
+}
diff --git a/samples/My.Hr/My.Hr.Common/Entities/Generated/EmergencyContact.cs b/samples/My.Hr/My.Hr.Common/Entities/Generated/EmergencyContact.cs
index 65469dfa0..aad5561ca 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/EmergencyContact.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/EmergencyContact.cs
@@ -2,52 +2,45 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace My.Hr.Common.Entities;
 
-namespace My.Hr.Common.Entities
+/// <summary>
+/// Represents the Emergency Contact entity.
+/// </summary>
+public partial class EmergencyContact : IIdentifier<Guid>
 {
     /// <summary>
-    /// Represents the Emergency Contact entity.
+    /// Gets or sets the identifier.
     /// </summary>
-    public partial class EmergencyContact : IIdentifier<Guid>
-    {
-        /// <summary>
-        /// Gets or sets the identifier.
-        /// </summary>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the First Name.
-        /// </summary>
-        public string? FirstName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Last Name.
-        /// </summary>
-        public string? LastName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Phone No.
-        /// </summary>
-        public string? PhoneNo { get; set; }
-
-        /// <summary>
-        /// Gets the corresponding <c>Relationship</c> text (read-only where selected).
-        /// </summary>
-        public string? RelationshipText { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Relationship code.
-        /// </summary>
-        public string? Relationship { get; set; }
-    }
+    public Guid Id { get; set; }
 
     /// <summary>
-    /// Represents the <c>EmergencyContact</c> collection.
+    /// Gets or sets the First Name.
     /// </summary>
-    public partial class EmergencyContactCollection : List<EmergencyContact> { }
-}
\ No newline at end of file
+    public string? FirstName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Last Name.
+    /// </summary>
+    public string? LastName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Phone No.
+    /// </summary>
+    public string? PhoneNo { get; set; }
+
+    /// <summary>
+    /// Gets the corresponding <c>Relationship</c> text (read-only where selected).
+    /// </summary>
+    public string? RelationshipText { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Relationship code.
+    /// </summary>
+    public string? Relationship { get; set; }
+}
+
+/// <summary>
+/// Represents the <c>EmergencyContact</c> collection.
+/// </summary>
+public partial class EmergencyContactCollection : List<EmergencyContact> { }
diff --git a/samples/My.Hr/My.Hr.Common/Entities/Generated/Employee.cs b/samples/My.Hr/My.Hr.Common/Entities/Generated/Employee.cs
index c3e56cb56..8a75c1235 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/Employee.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/Employee.cs
@@ -2,38 +2,31 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace My.Hr.Common.Entities;
 
-namespace My.Hr.Common.Entities
+/// <summary>
+/// Represents the Employee entity.
+/// </summary>
+public partial class Employee : EmployeeBase, IETag, IChangeLog
 {
     /// <summary>
-    /// Represents the Employee entity.
+    /// Gets or sets the Address.
     /// </summary>
-    public partial class Employee : EmployeeBase, IETag, IChangeLog
-    {
-        /// <summary>
-        /// Gets or sets the Address.
-        /// </summary>
-        public Address? Address { get; set; }
+    public Address? Address { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Emergency Contacts.
-        /// </summary>
-        public EmergencyContactCollection? EmergencyContacts { get; set; }
+    /// <summary>
+    /// Gets or sets the Emergency Contacts.
+    /// </summary>
+    public EmergencyContactCollection? EmergencyContacts { get; set; }
 
-        /// <summary>
-        /// Gets or sets the ETag.
-        /// </summary>
-        [JsonPropertyName("etag")]
-        public string? ETag { get; set; }
+    /// <summary>
+    /// Gets or sets the ETag.
+    /// </summary>
+    [JsonPropertyName("etag")]
+    public string? ETag { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Change Log.
-        /// </summary>
-        public ChangeLog? ChangeLog { get; set; }
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Gets or sets the Change Log.
+    /// </summary>
+    public ChangeLog? ChangeLog { get; set; }
+}
diff --git a/samples/My.Hr/My.Hr.Common/Entities/Generated/EmployeeArgs.cs b/samples/My.Hr/My.Hr.Common/Entities/Generated/EmployeeArgs.cs
index 63ba17012..d9a489a21 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/EmployeeArgs.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/EmployeeArgs.cs
@@ -2,48 +2,41 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace My.Hr.Common.Entities;
 
-namespace My.Hr.Common.Entities
+/// <summary>
+/// Represents the <c>Employee</c> search arguments entity.
+/// </summary>
+public partial class EmployeeArgs
 {
     /// <summary>
-    /// Represents the <c>Employee</c> search arguments entity.
+    /// Gets or sets the First Name.
     /// </summary>
-    public partial class EmployeeArgs
-    {
-        /// <summary>
-        /// Gets or sets the First Name.
-        /// </summary>
-        public string? FirstName { get; set; }
+    public string? FirstName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Last Name.
-        /// </summary>
-        public string? LastName { get; set; }
+    /// <summary>
+    /// Gets or sets the Last Name.
+    /// </summary>
+    public string? LastName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Genders code(s).
-        /// </summary>
-        public List<string?>? Genders { get; set; }
+    /// <summary>
+    /// Gets or sets the Genders code(s).
+    /// </summary>
+    public List<string?>? Genders { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Start From.
-        /// </summary>
-        public DateTime? StartFrom { get; set; }
+    /// <summary>
+    /// Gets or sets the Start From.
+    /// </summary>
+    public DateTime? StartFrom { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Start To.
-        /// </summary>
-        public DateTime? StartTo { get; set; }
+    /// <summary>
+    /// Gets or sets the Start To.
+    /// </summary>
+    public DateTime? StartTo { get; set; }
 
-        /// <summary>
-        /// Indicates whether Is Include Terminated.
-        /// </summary>
-        [JsonPropertyName("includeTerminated")]
-        public bool? IsIncludeTerminated { get; set; }
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Indicates whether Is Include Terminated.
+    /// </summary>
+    [JsonPropertyName("includeTerminated")]
+    public bool? IsIncludeTerminated { get; set; }
+}
diff --git a/samples/My.Hr/My.Hr.Common/Entities/Generated/EmployeeBase.cs b/samples/My.Hr/My.Hr.Common/Entities/Generated/EmployeeBase.cs
index 3ff8df7b6..a3d18f25d 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/EmployeeBase.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/EmployeeBase.cs
@@ -2,96 +2,89 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace My.Hr.Common.Entities;
 
-namespace My.Hr.Common.Entities
+/// <summary>
+/// Represents the <c>Employee</c> base entity.
+/// </summary>
+public partial class EmployeeBase : IIdentifier<Guid>
 {
     /// <summary>
-    /// Represents the <c>Employee</c> base entity.
+    /// Gets or sets the <c>Employee</c> identifier.
     /// </summary>
-    public partial class EmployeeBase : IIdentifier<Guid>
-    {
-        /// <summary>
-        /// Gets or sets the <c>Employee</c> identifier.
-        /// </summary>
-        public Guid Id { get; set; }
+    public Guid Id { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Unique <c>Employee</c> Email.
-        /// </summary>
-        public string? Email { get; set; }
-
-        /// <summary>
-        /// Gets or sets the First Name.
-        /// </summary>
-        public string? FirstName { get; set; }
+    /// <summary>
+    /// Gets or sets the Unique <c>Employee</c> Email.
+    /// </summary>
+    public string? Email { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Last Name.
-        /// </summary>
-        public string? LastName { get; set; }
+    /// <summary>
+    /// Gets or sets the First Name.
+    /// </summary>
+    public string? FirstName { get; set; }
 
-        /// <summary>
-        /// Gets the corresponding <c>Gender</c> text (read-only where selected).
-        /// </summary>
-        public string? GenderText { get; set; }
+    /// <summary>
+    /// Gets or sets the Last Name.
+    /// </summary>
+    public string? LastName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Gender code.
-        /// </summary>
-        public string? Gender { get; set; }
+    /// <summary>
+    /// Gets the corresponding <c>Gender</c> text (read-only where selected).
+    /// </summary>
+    public string? GenderText { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Birthday.
-        /// </summary>
-        public DateTime Birthday { get; set; }
+    /// <summary>
+    /// Gets or sets the Gender code.
+    /// </summary>
+    public string? Gender { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Start Date.
-        /// </summary>
-        public DateTime StartDate { get; set; }
+    /// <summary>
+    /// Gets or sets the Birthday.
+    /// </summary>
+    public DateTime Birthday { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Termination.
-        /// </summary>
-        public TerminationDetail? Termination { get; set; }
+    /// <summary>
+    /// Gets or sets the Start Date.
+    /// </summary>
+    public DateTime StartDate { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Phone No.
-        /// </summary>
-        public string? PhoneNo { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the Termination.
+    /// </summary>
+    public TerminationDetail? Termination { get; set; }
 
     /// <summary>
-    /// Represents the <c>EmployeeBase</c> collection.
+    /// Gets or sets the Phone No.
     /// </summary>
-    public partial class EmployeeBaseCollection : List<EmployeeBase> { }
+    public string? PhoneNo { get; set; }
+}
+
+/// <summary>
+/// Represents the <c>EmployeeBase</c> collection.
+/// </summary>
+public partial class EmployeeBaseCollection : List<EmployeeBase> { }
 
+/// <summary>
+/// Represents the <c>EmployeeBase</c> collection result.
+/// </summary>
+public class EmployeeBaseCollectionResult : CollectionResult<EmployeeBaseCollection, EmployeeBase>
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EmployeeBaseCollectionResult"/> class.
+    /// </summary>
+    public EmployeeBaseCollectionResult() { }
+    
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EmployeeBaseCollectionResult"/> class with <paramref name="paging"/>.
+    /// </summary>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public EmployeeBaseCollectionResult(PagingArgs? paging) : base(paging) { }
+    
     /// <summary>
-    /// Represents the <c>EmployeeBase</c> collection result.
+    /// Initializes a new instance of the <see cref="EmployeeBaseCollectionResult"/> class with <paramref name="items"/> to add.
     /// </summary>
-    public class EmployeeBaseCollectionResult : CollectionResult<EmployeeBaseCollection, EmployeeBase>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EmployeeBaseCollectionResult"/> class.
-        /// </summary>
-        public EmployeeBaseCollectionResult() { }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EmployeeBaseCollectionResult"/> class with <paramref name="paging"/>.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public EmployeeBaseCollectionResult(PagingArgs? paging) : base(paging) { }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EmployeeBaseCollectionResult"/> class with <paramref name="items"/> to add.
-        /// </summary>
-        /// <param name="items">The items to add.</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public EmployeeBaseCollectionResult(IEnumerable<EmployeeBase> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
-    }
-}
\ No newline at end of file
+    /// <param name="items">The items to add.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public EmployeeBaseCollectionResult(IEnumerable<EmployeeBase> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
+}
diff --git a/samples/My.Hr/My.Hr.Common/Entities/Generated/Gender.cs b/samples/My.Hr/My.Hr.Common/Entities/Generated/Gender.cs
index 5bd562787..786e1267b 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/Gender.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/Gender.cs
@@ -2,22 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace My.Hr.Common.Entities;
 
-namespace My.Hr.Common.Entities
-{
-    /// <summary>
-    /// Represents the Gender entity.
-    /// </summary>
-    public partial class Gender : ReferenceDataBase<Guid> { }
+/// <summary>
+/// Represents the Gender entity.
+/// </summary>
+public partial class Gender : ReferenceDataBase<Guid> { }
 
-    /// <summary>
-    /// Represents the <c>Gender</c> collection.
-    /// </summary>
-    public partial class GenderCollection : List<Gender> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the <c>Gender</c> collection.
+/// </summary>
+public partial class GenderCollection : List<Gender> { }
diff --git a/samples/My.Hr/My.Hr.Common/Entities/Generated/PerformanceOutcome.cs b/samples/My.Hr/My.Hr.Common/Entities/Generated/PerformanceOutcome.cs
index e1c1261d4..f7760e6cb 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/PerformanceOutcome.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/PerformanceOutcome.cs
@@ -2,22 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace My.Hr.Common.Entities;
 
-namespace My.Hr.Common.Entities
-{
-    /// <summary>
-    /// Represents the Performance Outcome entity.
-    /// </summary>
-    public partial class PerformanceOutcome : ReferenceDataBase<Guid> { }
+/// <summary>
+/// Represents the Performance Outcome entity.
+/// </summary>
+public partial class PerformanceOutcome : ReferenceDataBase<Guid> { }
 
-    /// <summary>
-    /// Represents the <c>PerformanceOutcome</c> collection.
-    /// </summary>
-    public partial class PerformanceOutcomeCollection : List<PerformanceOutcome> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the <c>PerformanceOutcome</c> collection.
+/// </summary>
+public partial class PerformanceOutcomeCollection : List<PerformanceOutcome> { }
diff --git a/samples/My.Hr/My.Hr.Common/Entities/Generated/PerformanceReview.cs b/samples/My.Hr/My.Hr.Common/Entities/Generated/PerformanceReview.cs
index 77615746b..825047e10 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/PerformanceReview.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/PerformanceReview.cs
@@ -2,92 +2,85 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace My.Hr.Common.Entities;
 
-namespace My.Hr.Common.Entities
+/// <summary>
+/// Represents the Performance Review entity.
+/// </summary>
+public partial class PerformanceReview : IIdentifier<Guid>, IETag, IChangeLog
 {
     /// <summary>
-    /// Represents the Performance Review entity.
+    /// Gets or sets the <c>Employee</c> identifier.
     /// </summary>
-    public partial class PerformanceReview : IIdentifier<Guid>, IETag, IChangeLog
-    {
-        /// <summary>
-        /// Gets or sets the <c>Employee</c> identifier.
-        /// </summary>
-        public Guid Id { get; set; }
+    public Guid Id { get; set; }
 
-        /// <summary>
-        /// Gets or sets the <c>Employee.Id</c> (value is immutable).
-        /// </summary>
-        public Guid EmployeeId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Date.
-        /// </summary>
-        public DateTime Date { get; set; }
+    /// <summary>
+    /// Gets or sets the <c>Employee.Id</c> (value is immutable).
+    /// </summary>
+    public Guid EmployeeId { get; set; }
 
-        /// <summary>
-        /// Gets the corresponding <c>Outcome</c> text (read-only where selected).
-        /// </summary>
-        public string? OutcomeText { get; set; }
+    /// <summary>
+    /// Gets or sets the Date.
+    /// </summary>
+    public DateTime Date { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Outcome code.
-        /// </summary>
-        public string? Outcome { get; set; }
+    /// <summary>
+    /// Gets the corresponding <c>Outcome</c> text (read-only where selected).
+    /// </summary>
+    public string? OutcomeText { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Reviewer.
-        /// </summary>
-        public string? Reviewer { get; set; }
+    /// <summary>
+    /// Gets or sets the Outcome code.
+    /// </summary>
+    public string? Outcome { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Notes.
-        /// </summary>
-        public string? Notes { get; set; }
+    /// <summary>
+    /// Gets or sets the Reviewer.
+    /// </summary>
+    public string? Reviewer { get; set; }
 
-        /// <summary>
-        /// Gets or sets the ETag.
-        /// </summary>
-        [JsonPropertyName("etag")]
-        public string? ETag { get; set; }
+    /// <summary>
+    /// Gets or sets the Notes.
+    /// </summary>
+    public string? Notes { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Change Log.
-        /// </summary>
-        public ChangeLog? ChangeLog { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the ETag.
+    /// </summary>
+    [JsonPropertyName("etag")]
+    public string? ETag { get; set; }
 
     /// <summary>
-    /// Represents the <c>PerformanceReview</c> collection.
+    /// Gets or sets the Change Log.
     /// </summary>
-    public partial class PerformanceReviewCollection : List<PerformanceReview> { }
+    public ChangeLog? ChangeLog { get; set; }
+}
+
+/// <summary>
+/// Represents the <c>PerformanceReview</c> collection.
+/// </summary>
+public partial class PerformanceReviewCollection : List<PerformanceReview> { }
 
+/// <summary>
+/// Represents the <c>PerformanceReview</c> collection result.
+/// </summary>
+public class PerformanceReviewCollectionResult : CollectionResult<PerformanceReviewCollection, PerformanceReview>
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PerformanceReviewCollectionResult"/> class.
+    /// </summary>
+    public PerformanceReviewCollectionResult() { }
+    
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PerformanceReviewCollectionResult"/> class with <paramref name="paging"/>.
+    /// </summary>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public PerformanceReviewCollectionResult(PagingArgs? paging) : base(paging) { }
+    
     /// <summary>
-    /// Represents the <c>PerformanceReview</c> collection result.
+    /// Initializes a new instance of the <see cref="PerformanceReviewCollectionResult"/> class with <paramref name="items"/> to add.
     /// </summary>
-    public class PerformanceReviewCollectionResult : CollectionResult<PerformanceReviewCollection, PerformanceReview>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PerformanceReviewCollectionResult"/> class.
-        /// </summary>
-        public PerformanceReviewCollectionResult() { }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PerformanceReviewCollectionResult"/> class with <paramref name="paging"/>.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public PerformanceReviewCollectionResult(PagingArgs? paging) : base(paging) { }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PerformanceReviewCollectionResult"/> class with <paramref name="items"/> to add.
-        /// </summary>
-        /// <param name="items">The items to add.</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public PerformanceReviewCollectionResult(IEnumerable<PerformanceReview> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
-    }
-}
\ No newline at end of file
+    /// <param name="items">The items to add.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public PerformanceReviewCollectionResult(IEnumerable<PerformanceReview> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
+}
diff --git a/samples/My.Hr/My.Hr.Common/Entities/Generated/RelationshipType.cs b/samples/My.Hr/My.Hr.Common/Entities/Generated/RelationshipType.cs
index 266d0a04d..7209a932c 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/RelationshipType.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/RelationshipType.cs
@@ -2,22 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace My.Hr.Common.Entities;
 
-namespace My.Hr.Common.Entities
-{
-    /// <summary>
-    /// Represents the Relationship Type entity.
-    /// </summary>
-    public partial class RelationshipType : ReferenceDataBase<Guid> { }
+/// <summary>
+/// Represents the Relationship Type entity.
+/// </summary>
+public partial class RelationshipType : ReferenceDataBase<Guid> { }
 
-    /// <summary>
-    /// Represents the <c>RelationshipType</c> collection.
-    /// </summary>
-    public partial class RelationshipTypeCollection : List<RelationshipType> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the <c>RelationshipType</c> collection.
+/// </summary>
+public partial class RelationshipTypeCollection : List<RelationshipType> { }
diff --git a/samples/My.Hr/My.Hr.Common/Entities/Generated/TerminationDetail.cs b/samples/My.Hr/My.Hr.Common/Entities/Generated/TerminationDetail.cs
index 76c13b4be..f5a08fc3d 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/TerminationDetail.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/TerminationDetail.cs
@@ -2,32 +2,25 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace My.Hr.Common.Entities;
 
-namespace My.Hr.Common.Entities
+/// <summary>
+/// Represents the Termination Detail entity.
+/// </summary>
+public partial class TerminationDetail
 {
     /// <summary>
-    /// Represents the Termination Detail entity.
+    /// Gets or sets the Date.
     /// </summary>
-    public partial class TerminationDetail
-    {
-        /// <summary>
-        /// Gets or sets the Date.
-        /// </summary>
-        public DateTime Date { get; set; }
+    public DateTime Date { get; set; }
 
-        /// <summary>
-        /// Gets the corresponding <c>Reason</c> text (read-only where selected).
-        /// </summary>
-        public string? ReasonText { get; set; }
+    /// <summary>
+    /// Gets the corresponding <c>Reason</c> text (read-only where selected).
+    /// </summary>
+    public string? ReasonText { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Reason code.
-        /// </summary>
-        public string? Reason { get; set; }
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Gets or sets the Reason code.
+    /// </summary>
+    public string? Reason { get; set; }
+}
diff --git a/samples/My.Hr/My.Hr.Common/Entities/Generated/TerminationReason.cs b/samples/My.Hr/My.Hr.Common/Entities/Generated/TerminationReason.cs
index ab0740cff..e12ece146 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/TerminationReason.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/TerminationReason.cs
@@ -2,22 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace My.Hr.Common.Entities;
 
-namespace My.Hr.Common.Entities
-{
-    /// <summary>
-    /// Represents the Termination Reason entity.
-    /// </summary>
-    public partial class TerminationReason : ReferenceDataBase<Guid> { }
+/// <summary>
+/// Represents the Termination Reason entity.
+/// </summary>
+public partial class TerminationReason : ReferenceDataBase<Guid> { }
 
-    /// <summary>
-    /// Represents the <c>TerminationReason</c> collection.
-    /// </summary>
-    public partial class TerminationReasonCollection : List<TerminationReason> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the <c>TerminationReason</c> collection.
+/// </summary>
+public partial class TerminationReasonCollection : List<TerminationReason> { }
diff --git a/samples/My.Hr/My.Hr.Common/Entities/Generated/USState.cs b/samples/My.Hr/My.Hr.Common/Entities/Generated/USState.cs
index 81d827b89..eba3e7528 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/USState.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/USState.cs
@@ -2,22 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace My.Hr.Common.Entities;
 
-namespace My.Hr.Common.Entities
-{
-    /// <summary>
-    /// Represents the US State entity.
-    /// </summary>
-    public partial class USState : ReferenceDataBase<Guid> { }
+/// <summary>
+/// Represents the US State entity.
+/// </summary>
+public partial class USState : ReferenceDataBase<Guid> { }
 
-    /// <summary>
-    /// Represents the <c>USState</c> collection.
-    /// </summary>
-    public partial class USStateCollection : List<USState> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the <c>USState</c> collection.
+/// </summary>
+public partial class USStateCollection : List<USState> { }
diff --git a/samples/My.Hr/My.Hr.Common/GlobalUsings.cs b/samples/My.Hr/My.Hr.Common/GlobalUsings.cs
new file mode 100644
index 000000000..d26eab543
--- /dev/null
+++ b/samples/My.Hr/My.Hr.Common/GlobalUsings.cs
@@ -0,0 +1,13 @@
+global using CoreEx.Entities;
+global using CoreEx.Http;
+global using CoreEx.Json;
+global using CoreEx.RefData;
+global using System;
+global using System.Collections.Generic;
+global using System.Diagnostics.CodeAnalysis;
+global using System.Text.Json.Serialization;
+global using System.Net.Http;
+global using System.Threading;
+global using System.Threading.Tasks;
+global using My.Hr.Common.Entities;
+global using RefDataNamespace = My.Hr.Common.Entities;
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Common/My.Hr.Common.csproj b/samples/My.Hr/My.Hr.Common/My.Hr.Common.csproj
index 0ec02a326..0122b62e5 100644
--- a/samples/My.Hr/My.Hr.Common/My.Hr.Common.csproj
+++ b/samples/My.Hr/My.Hr.Common/My.Hr.Common.csproj
@@ -2,6 +2,8 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <Nullable>enable</Nullable>
+    <LangVersion>Preview</LangVersion>
+    <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="CoreEx" Version="3.27.1" />
diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/EmployeeAgent.cs b/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/EmployeeAgent.cs
index ffe828c0c..d93200eb9 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/EmployeeAgent.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/EmployeeAgent.cs
@@ -2,62 +2,50 @@
  * This file is automatically generated; any changes will be lost.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using MyEf.Hr.Common.Entities;
-using RefDataNamespace = MyEf.Hr.Common.Entities;
-
-namespace MyEf.Hr.Common.Agents
+namespace MyEf.Hr.Common.Agents;
+
+/// <summary>
+/// Provides the <see cref="Employee"/> HTTP agent.
+/// </summary>
+public partial class EmployeeAgent : TypedHttpClientBase<EmployeeAgent>, IEmployeeAgent
 {
     /// <summary>
-    /// Provides the <see cref="Employee"/> HTTP agent.
+    /// Initializes a new instance of the <see cref="EmployeeAgent"/> class.
     /// </summary>
-    public partial class EmployeeAgent : TypedHttpClientBase<EmployeeAgent>, IEmployeeAgent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EmployeeAgent"/> class.
-        /// </summary>
-        /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
-        /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
-        public EmployeeAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Employee?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<Employee?>("employees/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Employee>> CreateAsync(Employee value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync<Employee, Employee>("employees", value, requestOptions: requestOptions, cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Employee>> UpdateAsync(Employee value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PutAsync<Employee, Employee>("employees/{id}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Employee>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PatchAsync<Employee>("employees/{id}", patchOption, value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => DeleteAsync("employees/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<EmployeeBaseCollectionResult>> GetByArgsAsync(EmployeeArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<EmployeeBaseCollectionResult>("employees", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(new HttpArg<EmployeeArgs?>("args", args, HttpArgType.FromUriUseProperties)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<EmployeeBaseCollectionResult>> GetByQueryAsync(QueryArgs? query = null, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<EmployeeBaseCollectionResult>("employees/query", requestOptions: requestOptions.IncludeQuery(query).IncludePaging(paging), args: HttpArgs.Create(), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<Employee>> TerminateAsync(TerminationDetail value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync<TerminationDetail, Employee>("employees/{id}/terminate", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-    }
+    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
+    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
+    /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
+    public EmployeeAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Employee?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<Employee?>("employees/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Employee>> CreateAsync(Employee value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync<Employee, Employee>("employees", value, requestOptions: requestOptions, cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Employee>> UpdateAsync(Employee value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PutAsync<Employee, Employee>("employees/{id}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Employee>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PatchAsync<Employee>("employees/{id}", patchOption, value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => DeleteAsync("employees/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<EmployeeBaseCollectionResult>> GetByArgsAsync(EmployeeArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<EmployeeBaseCollectionResult>("employees", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(new HttpArg<EmployeeArgs?>("args", args, HttpArgType.FromUriUseProperties)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<EmployeeBaseCollectionResult>> GetByQueryAsync(QueryArgs? query = null, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<EmployeeBaseCollectionResult>("employees/query", requestOptions: requestOptions.IncludeQuery(query).IncludePaging(paging), args: HttpArgs.Create(), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<Employee>> TerminateAsync(TerminationDetail value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync<TerminationDetail, Employee>("employees/{id}/terminate", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
 }
\ No newline at end of file
diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/IEmployeeAgent.cs b/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/IEmployeeAgent.cs
index bf4cd314e..673e780ce 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/IEmployeeAgent.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/IEmployeeAgent.cs
@@ -2,102 +2,88 @@
  * This file is automatically generated; any changes will be lost.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using Microsoft.Extensions.Logging;
-using MyEf.Hr.Common.Entities;
-using RefDataNamespace = MyEf.Hr.Common.Entities;
+namespace MyEf.Hr.Common.Agents;
 
-namespace MyEf.Hr.Common.Agents
+/// <summary>
+/// Defines the <see cref="Employee"/> HTTP agent.
+/// </summary>
+public partial interface IEmployeeAgent
 {
     /// <summary>
-    /// Defines the <see cref="Employee"/> HTTP agent.
+    /// Gets the specified <see cref="Employee"/>.
     /// </summary>
-    public partial interface IEmployeeAgent
-    {
-        /// <summary>
-        /// Gets the specified <see cref="Employee"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="Employee"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Employee?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <param name="id">The <see cref="Employee"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Employee?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Creates a new <see cref="Employee"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="Employee"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Employee>> CreateAsync(Employee value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Creates a new <see cref="Employee"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="Employee"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Employee>> CreateAsync(Employee value, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Updates an existing <see cref="Employee"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="Employee"/>.</param>
-        /// <param name="id">The <see cref="Employee"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Employee>> UpdateAsync(Employee value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Updates an existing <see cref="Employee"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="Employee"/>.</param>
+    /// <param name="id">The <see cref="Employee"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Employee>> UpdateAsync(Employee value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Patches an existing <see cref="Employee"/>.
-        /// </summary>
-        /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
-        /// <param name="value">The <see cref="string"/> that contains the patch content for the <see cref="Employee"/>.</param>
-        /// <param name="id">The <see cref="Employee"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Employee>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Patches an existing <see cref="Employee"/>.
+    /// </summary>
+    /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
+    /// <param name="value">The <see cref="string"/> that contains the patch content for the <see cref="Employee"/>.</param>
+    /// <param name="id">The <see cref="Employee"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Employee>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Deletes the specified <see cref="Employee"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="Employee"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Deletes the specified <see cref="Employee"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="Employee"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets the <see cref="EmployeeBaseCollectionResult"/> that contains the items that match the selection criteria.
-        /// </summary>
-        /// <param name="args">The Args (see <see cref="EmployeeArgs"/>).</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<EmployeeBaseCollectionResult>> GetByArgsAsync(EmployeeArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets the <see cref="EmployeeBaseCollectionResult"/> that contains the items that match the selection criteria.
+    /// </summary>
+    /// <param name="args">The Args (see <see cref="EmployeeArgs"/>).</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<EmployeeBaseCollectionResult>> GetByArgsAsync(EmployeeArgs? args, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets the <see cref="EmployeeBaseCollectionResult"/> that contains the items that match the selection criteria.
-        /// </summary>
-        /// <param name="query">The <see cref="QueryArgs"/>.</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<EmployeeBaseCollectionResult>> GetByQueryAsync(QueryArgs? query = null, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets the <see cref="EmployeeBaseCollectionResult"/> that contains the items that match the selection criteria.
+    /// </summary>
+    /// <param name="query">The <see cref="QueryArgs"/>.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<EmployeeBaseCollectionResult>> GetByQueryAsync(QueryArgs? query = null, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Terminates an existing <see cref="Employee"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="TerminationDetail"/>.</param>
-        /// <param name="id">The <see cref="Employee"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<Employee>> TerminateAsync(TerminationDetail value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-    }
+    /// <summary>
+    /// Terminates an existing <see cref="Employee"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="TerminationDetail"/>.</param>
+    /// <param name="id">The <see cref="Employee"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<Employee>> TerminateAsync(TerminationDetail value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/IPerformanceReviewAgent.cs b/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/IPerformanceReviewAgent.cs
index 21e139f88..a930f97e8 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/IPerformanceReviewAgent.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/IPerformanceReviewAgent.cs
@@ -2,83 +2,69 @@
  * This file is automatically generated; any changes will be lost.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using Microsoft.Extensions.Logging;
-using MyEf.Hr.Common.Entities;
-using RefDataNamespace = MyEf.Hr.Common.Entities;
+namespace MyEf.Hr.Common.Agents;
 
-namespace MyEf.Hr.Common.Agents
+/// <summary>
+/// Defines the <see cref="PerformanceReview"/> HTTP agent.
+/// </summary>
+public partial interface IPerformanceReviewAgent
 {
     /// <summary>
-    /// Defines the <see cref="PerformanceReview"/> HTTP agent.
+    /// Gets the specified <see cref="PerformanceReview"/>.
     /// </summary>
-    public partial interface IPerformanceReviewAgent
-    {
-        /// <summary>
-        /// Gets the specified <see cref="PerformanceReview"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="PerformanceReview"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PerformanceReview?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <param name="id">The <see cref="PerformanceReview"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PerformanceReview?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Updates an existing <see cref="PerformanceReview"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="PerformanceReview"/>.</param>
-        /// <param name="id">The <see cref="PerformanceReview"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PerformanceReview>> UpdateAsync(PerformanceReview value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Updates an existing <see cref="PerformanceReview"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="PerformanceReview"/>.</param>
+    /// <param name="id">The <see cref="PerformanceReview"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PerformanceReview>> UpdateAsync(PerformanceReview value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Patches an existing <see cref="PerformanceReview"/>.
-        /// </summary>
-        /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
-        /// <param name="value">The <see cref="string"/> that contains the patch content for the <see cref="PerformanceReview"/>.</param>
-        /// <param name="id">The <see cref="PerformanceReview"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PerformanceReview>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Patches an existing <see cref="PerformanceReview"/>.
+    /// </summary>
+    /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
+    /// <param name="value">The <see cref="string"/> that contains the patch content for the <see cref="PerformanceReview"/>.</param>
+    /// <param name="id">The <see cref="PerformanceReview"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PerformanceReview>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Deletes the specified <see cref="PerformanceReview"/>.
-        /// </summary>
-        /// <param name="id">The <see cref="PerformanceReview"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Deletes the specified <see cref="PerformanceReview"/>.
+    /// </summary>
+    /// <param name="id">The <see cref="PerformanceReview"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets the <see cref="PerformanceReviewCollectionResult"/> that contains the items that match the selection criteria.
-        /// </summary>
-        /// <param name="employeeId">The <see cref="Employee"/> identifier.</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PerformanceReviewCollectionResult>> GetByEmployeeIdAsync(Guid employeeId, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets the <see cref="PerformanceReviewCollectionResult"/> that contains the items that match the selection criteria.
+    /// </summary>
+    /// <param name="employeeId">The <see cref="Employee"/> identifier.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PerformanceReviewCollectionResult>> GetByEmployeeIdAsync(Guid employeeId, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Creates a new <see cref="PerformanceReview"/>.
-        /// </summary>
-        /// <param name="value">The <see cref="PerformanceReview"/>.</param>
-        /// <param name="employeeId">The <see cref="Employee"/> identifier.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<PerformanceReview>> CreateAsync(PerformanceReview value, Guid employeeId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-    }
+    /// <summary>
+    /// Creates a new <see cref="PerformanceReview"/>.
+    /// </summary>
+    /// <param name="value">The <see cref="PerformanceReview"/>.</param>
+    /// <param name="employeeId">The <see cref="Employee"/> identifier.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<PerformanceReview>> CreateAsync(PerformanceReview value, Guid employeeId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/IReferenceDataAgent.cs b/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/IReferenceDataAgent.cs
index 74a153445..02a380734 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/IReferenceDataAgent.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/IReferenceDataAgent.cs
@@ -2,80 +2,65 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using CoreEx.RefData;
-using Microsoft.Extensions.Logging;
-using MyEf.Hr.Common.Entities;
-using RefDataNamespace = MyEf.Hr.Common.Entities;
+namespace MyEf.Hr.Common.Agents;
 
-namespace MyEf.Hr.Common.Agents
+/// <summary>
+/// Defines the <b>ReferenceData</b> HTTP agent.
+/// </summary>
+public partial interface IReferenceDataAgent
 {
     /// <summary>
-    /// Defines the <b>ReferenceData</b> HTTP agent.
+    /// Gets all of the <see cref="RefDataNamespace.Gender"/> items that match the filter arguments.
     /// </summary>
-    public partial interface IReferenceDataAgent
-    {
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.Gender"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.GenderCollection>> GenderGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.GenderCollection>> GenderGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.TerminationReason"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.TerminationReasonCollection>> TerminationReasonGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets all of the <see cref="RefDataNamespace.TerminationReason"/> items that match the filter arguments.
+    /// </summary>
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.TerminationReasonCollection>> TerminationReasonGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.RelationshipType"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.RelationshipTypeCollection>> RelationshipTypeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets all of the <see cref="RefDataNamespace.RelationshipType"/> items that match the filter arguments.
+    /// </summary>
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.RelationshipTypeCollection>> RelationshipTypeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.USState"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.USStateCollection>> USStateGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets all of the <see cref="RefDataNamespace.USState"/> items that match the filter arguments.
+    /// </summary>
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.USStateCollection>> USStateGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets all of the <see cref="RefDataNamespace.PerformanceOutcome"/> items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<RefDataNamespace.PerformanceOutcomeCollection>> PerformanceOutcomeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <summary>
+    /// Gets all of the <see cref="RefDataNamespace.PerformanceOutcome"/> items that match the filter arguments.
+    /// </summary>
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<RefDataNamespace.PerformanceOutcomeCollection>> PerformanceOutcomeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
-        /// <summary>
-        /// Gets the reference data entries for the specified entities and codes from the query string; e.g: ref?entity=codeX,codeY&amp;entity2=codeZ&amp;entity3
-        /// </summary>
-        /// <param name="names">The optional list of reference data names.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        /// <remarks>The reference data objects will need to be manually extracted from the corresponding response content.</remarks>
-        Task<HttpResult> GetNamedAsync(string[] names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-    }
+    /// <summary>
+    /// Gets the reference data entries for the specified entities and codes from the query string; e.g: ref?entity=codeX,codeY&amp;entity2=codeZ&amp;entity3
+    /// </summary>
+    /// <param name="names">The optional list of reference data names.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    /// <remarks>The reference data objects will need to be manually extracted from the corresponding response content.</remarks>
+    Task<HttpResult> GetNamedAsync(string[] names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/PerformanceReviewAgent.cs b/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/PerformanceReviewAgent.cs
index c0cc91392..5434e5ac4 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/PerformanceReviewAgent.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/PerformanceReviewAgent.cs
@@ -2,54 +2,42 @@
  * This file is automatically generated; any changes will be lost.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using MyEf.Hr.Common.Entities;
-using RefDataNamespace = MyEf.Hr.Common.Entities;
-
-namespace MyEf.Hr.Common.Agents
+namespace MyEf.Hr.Common.Agents;
+
+/// <summary>
+/// Provides the <see cref="PerformanceReview"/> HTTP agent.
+/// </summary>
+public partial class PerformanceReviewAgent : TypedHttpClientBase<PerformanceReviewAgent>, IPerformanceReviewAgent
 {
     /// <summary>
-    /// Provides the <see cref="PerformanceReview"/> HTTP agent.
+    /// Initializes a new instance of the <see cref="PerformanceReviewAgent"/> class.
     /// </summary>
-    public partial class PerformanceReviewAgent : TypedHttpClientBase<PerformanceReviewAgent>, IPerformanceReviewAgent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PerformanceReviewAgent"/> class.
-        /// </summary>
-        /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
-        /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
-        public PerformanceReviewAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PerformanceReview?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<PerformanceReview?>("reviews/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PerformanceReview>> UpdateAsync(PerformanceReview value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PutAsync<PerformanceReview, PerformanceReview>("reviews/{id}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PerformanceReview>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PatchAsync<PerformanceReview>("reviews/{id}", patchOption, value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => DeleteAsync("reviews/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PerformanceReviewCollectionResult>> GetByEmployeeIdAsync(Guid employeeId, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<PerformanceReviewCollectionResult>("employees/{employeeId}/reviews", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(new HttpArg<Guid>("employeeId", employeeId)), cancellationToken: cancellationToken);
-
-        /// <inheritdoc/>
-        public Task<HttpResult<PerformanceReview>> CreateAsync(PerformanceReview value, Guid employeeId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => PostAsync<PerformanceReview, PerformanceReview>("employees/{employeeId}/reviews", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("employeeId", employeeId)), cancellationToken: cancellationToken);
-    }
+    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
+    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
+    /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
+    public PerformanceReviewAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PerformanceReview?>> GetAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<PerformanceReview?>("reviews/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PerformanceReview>> UpdateAsync(PerformanceReview value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PutAsync<PerformanceReview, PerformanceReview>("reviews/{id}", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PerformanceReview>> PatchAsync(HttpPatchOption patchOption, string value, Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PatchAsync<PerformanceReview>("reviews/{id}", patchOption, value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult> DeleteAsync(Guid id, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => DeleteAsync("reviews/{id}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("id", id)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PerformanceReviewCollectionResult>> GetByEmployeeIdAsync(Guid employeeId, PagingArgs? paging = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<PerformanceReviewCollectionResult>("employees/{employeeId}/reviews", requestOptions: requestOptions.IncludePaging(paging), args: HttpArgs.Create(new HttpArg<Guid>("employeeId", employeeId)), cancellationToken: cancellationToken);
+
+    /// <inheritdoc/>
+    public Task<HttpResult<PerformanceReview>> CreateAsync(PerformanceReview value, Guid employeeId, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => PostAsync<PerformanceReview, PerformanceReview>("employees/{employeeId}/reviews", value, requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<Guid>("employeeId", employeeId)), cancellationToken: cancellationToken);
 }
\ No newline at end of file
diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/ReferenceDataAgent.cs b/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/ReferenceDataAgent.cs
index ab1178170..8d77d825a 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/ReferenceDataAgent.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Agents/Generated/ReferenceDataAgent.cs
@@ -2,61 +2,48 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using CoreEx.RefData;
-using MyEf.Hr.Common.Entities;
-using RefDataNamespace = MyEf.Hr.Common.Entities;
-
-namespace MyEf.Hr.Common.Agents
+namespace MyEf.Hr.Common.Agents;
+
+/// <summary>
+/// Provides the <b>ReferenceData</b> HTTP agent.
+/// </summary>
+public partial class ReferenceDataAgent : TypedHttpClientBase<ReferenceDataAgent>, IReferenceDataAgent
 {
     /// <summary>
-    /// Provides the <b>ReferenceData</b> HTTP agent.
+    /// Initializes a new instance of the <see cref="ReferenceDataAgent"/> class.
     /// </summary>
-    public partial class ReferenceDataAgent : TypedHttpClientBase<ReferenceDataAgent>, IReferenceDataAgent
+    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
+    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
+    /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
+    public ReferenceDataAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
+
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.GenderCollection>> GenderGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.GenderCollection>("ref/genders", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.TerminationReasonCollection>> TerminationReasonGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.TerminationReasonCollection>("ref/terminationreasons", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.RelationshipTypeCollection>> RelationshipTypeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.RelationshipTypeCollection>("ref/relationshiptypes", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.USStateCollection>> USStateGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.USStateCollection>("ref/usstates", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+
+    /// <inheritdoc/>
+    public Task<HttpResult<RefDataNamespace.PerformanceOutcomeCollection>> PerformanceOutcomeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<RefDataNamespace.PerformanceOutcomeCollection>("ref/performanceoutcomes", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+
+    /// <inheritdoc/>
+    public Task<HttpResult> GetNamedAsync(string[] names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReferenceDataAgent"/> class.
-        /// </summary>
-        /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
-        /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
-        public ReferenceDataAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
-
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.GenderCollection>> GenderGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.GenderCollection>("ref/genders", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
-
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.TerminationReasonCollection>> TerminationReasonGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.TerminationReasonCollection>("ref/terminationreasons", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
-
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.RelationshipTypeCollection>> RelationshipTypeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.RelationshipTypeCollection>("ref/relationshiptypes", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
-
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.USStateCollection>> USStateGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.USStateCollection>("ref/usstates", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
-
-        /// <inheritdoc/>
-        public Task<HttpResult<RefDataNamespace.PerformanceOutcomeCollection>> PerformanceOutcomeGetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<RefDataNamespace.PerformanceOutcomeCollection>("ref/performanceoutcomes", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
-
-        /// <inheritdoc/>
-        public Task<HttpResult> GetNamedAsync(string[] names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-        {
-            var ro = requestOptions ?? new HttpRequestOptions();
-            if (names != null)
-                ro.UrlQueryString += string.Join("&", names);
-                
-            return GetAsync("ref", ro, null, cancellationToken);
-        }
+        var ro = requestOptions ?? new HttpRequestOptions();
+        if (names != null)
+            ro.UrlQueryString += string.Join("&", names);
+            
+        return GetAsync("ref", ro, null, cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/Address.cs b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/Address.cs
index b6186cddf..b4f46d0a5 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/Address.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/Address.cs
@@ -2,47 +2,40 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace MyEf.Hr.Common.Entities;
 
-namespace MyEf.Hr.Common.Entities
+/// <summary>
+/// Represents the Address entity.
+/// </summary>
+public partial class Address
 {
     /// <summary>
-    /// Represents the Address entity.
+    /// Gets or sets the Street1.
     /// </summary>
-    public partial class Address
-    {
-        /// <summary>
-        /// Gets or sets the Street1.
-        /// </summary>
-        public string? Street1 { get; set; }
+    public string? Street1 { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Street2.
-        /// </summary>
-        public string? Street2 { get; set; }
+    /// <summary>
+    /// Gets or sets the Street2.
+    /// </summary>
+    public string? Street2 { get; set; }
 
-        /// <summary>
-        /// Gets or sets the City.
-        /// </summary>
-        public string? City { get; set; }
+    /// <summary>
+    /// Gets or sets the City.
+    /// </summary>
+    public string? City { get; set; }
 
-        /// <summary>
-        /// Gets the corresponding <c>State</c> text (read-only where selected).
-        /// </summary>
-        public string? StateText { get; set; }
+    /// <summary>
+    /// Gets the corresponding <c>State</c> text (read-only where selected).
+    /// </summary>
+    public string? StateText { get; set; }
 
-        /// <summary>
-        /// Gets or sets the State code.
-        /// </summary>
-        public string? State { get; set; }
+    /// <summary>
+    /// Gets or sets the State code.
+    /// </summary>
+    public string? State { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Post Code.
-        /// </summary>
-        public string? PostCode { get; set; }
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Gets or sets the Post Code.
+    /// </summary>
+    public string? PostCode { get; set; }
+}
diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/EmergencyContact.cs b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/EmergencyContact.cs
index d6b620c08..721d94716 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/EmergencyContact.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/EmergencyContact.cs
@@ -2,52 +2,45 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace MyEf.Hr.Common.Entities;
 
-namespace MyEf.Hr.Common.Entities
+/// <summary>
+/// Represents the Emergency Contact entity.
+/// </summary>
+public partial class EmergencyContact : IIdentifier<Guid>
 {
     /// <summary>
-    /// Represents the Emergency Contact entity.
+    /// Gets or sets the identifier.
     /// </summary>
-    public partial class EmergencyContact : IIdentifier<Guid>
-    {
-        /// <summary>
-        /// Gets or sets the identifier.
-        /// </summary>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the First Name.
-        /// </summary>
-        public string? FirstName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Last Name.
-        /// </summary>
-        public string? LastName { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Phone No.
-        /// </summary>
-        public string? PhoneNo { get; set; }
-
-        /// <summary>
-        /// Gets the corresponding <c>Relationship</c> text (read-only where selected).
-        /// </summary>
-        public string? RelationshipText { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Relationship code.
-        /// </summary>
-        public string? Relationship { get; set; }
-    }
+    public Guid Id { get; set; }
 
     /// <summary>
-    /// Represents the <c>EmergencyContact</c> collection.
+    /// Gets or sets the First Name.
     /// </summary>
-    public partial class EmergencyContactCollection : List<EmergencyContact> { }
-}
\ No newline at end of file
+    public string? FirstName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Last Name.
+    /// </summary>
+    public string? LastName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Phone No.
+    /// </summary>
+    public string? PhoneNo { get; set; }
+
+    /// <summary>
+    /// Gets the corresponding <c>Relationship</c> text (read-only where selected).
+    /// </summary>
+    public string? RelationshipText { get; set; }
+
+    /// <summary>
+    /// Gets or sets the Relationship code.
+    /// </summary>
+    public string? Relationship { get; set; }
+}
+
+/// <summary>
+/// Represents the <c>EmergencyContact</c> collection.
+/// </summary>
+public partial class EmergencyContactCollection : List<EmergencyContact> { }
diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/Employee.cs b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/Employee.cs
index 7cf1bca41..962a872a4 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/Employee.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/Employee.cs
@@ -2,38 +2,31 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace MyEf.Hr.Common.Entities;
 
-namespace MyEf.Hr.Common.Entities
+/// <summary>
+/// Represents the Employee entity.
+/// </summary>
+public partial class Employee : EmployeeBase, IETag, IChangeLog
 {
     /// <summary>
-    /// Represents the Employee entity.
+    /// Gets or sets the Address.
     /// </summary>
-    public partial class Employee : EmployeeBase, IETag, IChangeLog
-    {
-        /// <summary>
-        /// Gets or sets the Address.
-        /// </summary>
-        public Address? Address { get; set; }
+    public Address? Address { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Emergency Contacts.
-        /// </summary>
-        public EmergencyContactCollection? EmergencyContacts { get; set; }
+    /// <summary>
+    /// Gets or sets the Emergency Contacts.
+    /// </summary>
+    public EmergencyContactCollection? EmergencyContacts { get; set; }
 
-        /// <summary>
-        /// Gets or sets the ETag.
-        /// </summary>
-        [JsonPropertyName("etag")]
-        public string? ETag { get; set; }
+    /// <summary>
+    /// Gets or sets the ETag.
+    /// </summary>
+    [JsonPropertyName("etag")]
+    public string? ETag { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Change Log.
-        /// </summary>
-        public ChangeLog? ChangeLog { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the Change Log.
+    /// </summary>
+    public ChangeLog? ChangeLog { get; set; }
 }
\ No newline at end of file
diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/EmployeeArgs.cs b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/EmployeeArgs.cs
index ee89fa0bb..30935c69e 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/EmployeeArgs.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/EmployeeArgs.cs
@@ -2,48 +2,41 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace MyEf.Hr.Common.Entities;
 
-namespace MyEf.Hr.Common.Entities
+/// <summary>
+/// Represents the <c>Employee</c> Arguments entity.
+/// </summary>
+public partial class EmployeeArgs
 {
     /// <summary>
-    /// Represents the <c>Employee</c> Arguments entity.
+    /// Gets or sets the First Name.
     /// </summary>
-    public partial class EmployeeArgs
-    {
-        /// <summary>
-        /// Gets or sets the First Name.
-        /// </summary>
-        public string? FirstName { get; set; }
+    public string? FirstName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Last Name.
-        /// </summary>
-        public string? LastName { get; set; }
+    /// <summary>
+    /// Gets or sets the Last Name.
+    /// </summary>
+    public string? LastName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Genders code(s).
-        /// </summary>
-        public List<string?>? Genders { get; set; }
+    /// <summary>
+    /// Gets or sets the Genders code(s).
+    /// </summary>
+    public List<string?>? Genders { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Start From.
-        /// </summary>
-        public DateTime? StartFrom { get; set; }
+    /// <summary>
+    /// Gets or sets the Start From.
+    /// </summary>
+    public DateTime? StartFrom { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Start To.
-        /// </summary>
-        public DateTime? StartTo { get; set; }
+    /// <summary>
+    /// Gets or sets the Start To.
+    /// </summary>
+    public DateTime? StartTo { get; set; }
 
-        /// <summary>
-        /// Indicates whether Is Include Terminated.
-        /// </summary>
-        [JsonPropertyName("includeTerminated")]
-        public bool? IsIncludeTerminated { get; set; }
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Indicates whether Is Include Terminated.
+    /// </summary>
+    [JsonPropertyName("includeTerminated")]
+    public bool? IsIncludeTerminated { get; set; }
+}
diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/EmployeeBase.cs b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/EmployeeBase.cs
index ff939d26e..b385e9d40 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/EmployeeBase.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/EmployeeBase.cs
@@ -2,96 +2,89 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace MyEf.Hr.Common.Entities;
 
-namespace MyEf.Hr.Common.Entities
+/// <summary>
+/// Represents the <c>Employee</c> base entity.
+/// </summary>
+public partial class EmployeeBase : IIdentifier<Guid>
 {
     /// <summary>
-    /// Represents the <c>Employee</c> base entity.
+    /// Gets or sets the <c>Employee</c> identifier.
     /// </summary>
-    public partial class EmployeeBase : IIdentifier<Guid>
-    {
-        /// <summary>
-        /// Gets or sets the <c>Employee</c> identifier.
-        /// </summary>
-        public Guid Id { get; set; }
+    public Guid Id { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Unique <c>Employee</c> Email.
-        /// </summary>
-        public string? Email { get; set; }
-
-        /// <summary>
-        /// Gets or sets the First Name.
-        /// </summary>
-        public string? FirstName { get; set; }
+    /// <summary>
+    /// Gets or sets the Unique <c>Employee</c> Email.
+    /// </summary>
+    public string? Email { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Last Name.
-        /// </summary>
-        public string? LastName { get; set; }
+    /// <summary>
+    /// Gets or sets the First Name.
+    /// </summary>
+    public string? FirstName { get; set; }
 
-        /// <summary>
-        /// Gets the corresponding <c>Gender</c> text (read-only where selected).
-        /// </summary>
-        public string? GenderText { get; set; }
+    /// <summary>
+    /// Gets or sets the Last Name.
+    /// </summary>
+    public string? LastName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Gender code.
-        /// </summary>
-        public string? Gender { get; set; }
+    /// <summary>
+    /// Gets the corresponding <c>Gender</c> text (read-only where selected).
+    /// </summary>
+    public string? GenderText { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Birthday.
-        /// </summary>
-        public DateTime Birthday { get; set; }
+    /// <summary>
+    /// Gets or sets the Gender code.
+    /// </summary>
+    public string? Gender { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Start Date.
-        /// </summary>
-        public DateTime StartDate { get; set; }
+    /// <summary>
+    /// Gets or sets the Birthday.
+    /// </summary>
+    public DateTime Birthday { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Termination.
-        /// </summary>
-        public TerminationDetail? Termination { get; set; }
+    /// <summary>
+    /// Gets or sets the Start Date.
+    /// </summary>
+    public DateTime StartDate { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Phone No.
-        /// </summary>
-        public string? PhoneNo { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the Termination.
+    /// </summary>
+    public TerminationDetail? Termination { get; set; }
 
     /// <summary>
-    /// Represents the <c>EmployeeBase</c> collection.
+    /// Gets or sets the Phone No.
     /// </summary>
-    public partial class EmployeeBaseCollection : List<EmployeeBase> { }
+    public string? PhoneNo { get; set; }
+}
+
+/// <summary>
+/// Represents the <c>EmployeeBase</c> collection.
+/// </summary>
+public partial class EmployeeBaseCollection : List<EmployeeBase> { }
 
+/// <summary>
+/// Represents the <c>EmployeeBase</c> collection result.
+/// </summary>
+public class EmployeeBaseCollectionResult : CollectionResult<EmployeeBaseCollection, EmployeeBase>
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EmployeeBaseCollectionResult"/> class.
+    /// </summary>
+    public EmployeeBaseCollectionResult() { }
+    
+    /// <summary>
+    /// Initializes a new instance of the <see cref="EmployeeBaseCollectionResult"/> class with <paramref name="paging"/>.
+    /// </summary>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public EmployeeBaseCollectionResult(PagingArgs? paging) : base(paging) { }
+    
     /// <summary>
-    /// Represents the <c>EmployeeBase</c> collection result.
+    /// Initializes a new instance of the <see cref="EmployeeBaseCollectionResult"/> class with <paramref name="items"/> to add.
     /// </summary>
-    public class EmployeeBaseCollectionResult : CollectionResult<EmployeeBaseCollection, EmployeeBase>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EmployeeBaseCollectionResult"/> class.
-        /// </summary>
-        public EmployeeBaseCollectionResult() { }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EmployeeBaseCollectionResult"/> class with <paramref name="paging"/>.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public EmployeeBaseCollectionResult(PagingArgs? paging) : base(paging) { }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="EmployeeBaseCollectionResult"/> class with <paramref name="items"/> to add.
-        /// </summary>
-        /// <param name="items">The items to add.</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public EmployeeBaseCollectionResult(IEnumerable<EmployeeBase> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
-    }
-}
\ No newline at end of file
+    /// <param name="items">The items to add.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public EmployeeBaseCollectionResult(IEnumerable<EmployeeBase> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
+}
diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/Gender.cs b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/Gender.cs
index d0f45420a..ee09adf57 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/Gender.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/Gender.cs
@@ -2,22 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace MyEf.Hr.Common.Entities;
 
-namespace MyEf.Hr.Common.Entities
-{
-    /// <summary>
-    /// Represents the Gender entity.
-    /// </summary>
-    public partial class Gender : ReferenceDataBase<Guid> { }
+/// <summary>
+/// Represents the Gender entity.
+/// </summary>
+public partial class Gender : ReferenceDataBase<Guid> { }
 
-    /// <summary>
-    /// Represents the <c>Gender</c> collection.
-    /// </summary>
-    public partial class GenderCollection : List<Gender> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the <c>Gender</c> collection.
+/// </summary>
+public partial class GenderCollection : List<Gender> { }
diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/PerformanceOutcome.cs b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/PerformanceOutcome.cs
index 3f4be7b15..03bab523c 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/PerformanceOutcome.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/PerformanceOutcome.cs
@@ -2,22 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace MyEf.Hr.Common.Entities;
 
-namespace MyEf.Hr.Common.Entities
-{
-    /// <summary>
-    /// Represents the Performance Outcome entity.
-    /// </summary>
-    public partial class PerformanceOutcome : ReferenceDataBase<Guid> { }
+/// <summary>
+/// Represents the Performance Outcome entity.
+/// </summary>
+public partial class PerformanceOutcome : ReferenceDataBase<Guid> { }
 
-    /// <summary>
-    /// Represents the <c>PerformanceOutcome</c> collection.
-    /// </summary>
-    public partial class PerformanceOutcomeCollection : List<PerformanceOutcome> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the <c>PerformanceOutcome</c> collection.
+/// </summary>
+public partial class PerformanceOutcomeCollection : List<PerformanceOutcome> { }
diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/PerformanceReview.cs b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/PerformanceReview.cs
index 925ae5574..fbfcf92fe 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/PerformanceReview.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/PerformanceReview.cs
@@ -2,92 +2,85 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace MyEf.Hr.Common.Entities;
 
-namespace MyEf.Hr.Common.Entities
+/// <summary>
+/// Represents the Performance Review entity.
+/// </summary>
+public partial class PerformanceReview : IIdentifier<Guid>, IETag, IChangeLog
 {
     /// <summary>
-    /// Represents the Performance Review entity.
+    /// Gets or sets the <c>PerformanceReview</c> identifier.
     /// </summary>
-    public partial class PerformanceReview : IIdentifier<Guid>, IETag, IChangeLog
-    {
-        /// <summary>
-        /// Gets or sets the <c>PerformanceReview</c> identifier.
-        /// </summary>
-        public Guid Id { get; set; }
+    public Guid Id { get; set; }
 
-        /// <summary>
-        /// Gets or sets the <c>Employee.Id</c> (value is immutable).
-        /// </summary>
-        public Guid EmployeeId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Date.
-        /// </summary>
-        public DateTime Date { get; set; }
+    /// <summary>
+    /// Gets or sets the <c>Employee.Id</c> (value is immutable).
+    /// </summary>
+    public Guid EmployeeId { get; set; }
 
-        /// <summary>
-        /// Gets the corresponding <c>Outcome</c> text (read-only where selected).
-        /// </summary>
-        public string? OutcomeText { get; set; }
+    /// <summary>
+    /// Gets or sets the Date.
+    /// </summary>
+    public DateTime Date { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Outcome code.
-        /// </summary>
-        public string? Outcome { get; set; }
+    /// <summary>
+    /// Gets the corresponding <c>Outcome</c> text (read-only where selected).
+    /// </summary>
+    public string? OutcomeText { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Reviewer.
-        /// </summary>
-        public string? Reviewer { get; set; }
+    /// <summary>
+    /// Gets or sets the Outcome code.
+    /// </summary>
+    public string? Outcome { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Notes.
-        /// </summary>
-        public string? Notes { get; set; }
+    /// <summary>
+    /// Gets or sets the Reviewer.
+    /// </summary>
+    public string? Reviewer { get; set; }
 
-        /// <summary>
-        /// Gets or sets the ETag.
-        /// </summary>
-        [JsonPropertyName("etag")]
-        public string? ETag { get; set; }
+    /// <summary>
+    /// Gets or sets the Notes.
+    /// </summary>
+    public string? Notes { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Change Log.
-        /// </summary>
-        public ChangeLog? ChangeLog { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the ETag.
+    /// </summary>
+    [JsonPropertyName("etag")]
+    public string? ETag { get; set; }
 
     /// <summary>
-    /// Represents the <c>PerformanceReview</c> collection.
+    /// Gets or sets the Change Log.
     /// </summary>
-    public partial class PerformanceReviewCollection : List<PerformanceReview> { }
+    public ChangeLog? ChangeLog { get; set; }
+}
+
+/// <summary>
+/// Represents the <c>PerformanceReview</c> collection.
+/// </summary>
+public partial class PerformanceReviewCollection : List<PerformanceReview> { }
 
+/// <summary>
+/// Represents the <c>PerformanceReview</c> collection result.
+/// </summary>
+public class PerformanceReviewCollectionResult : CollectionResult<PerformanceReviewCollection, PerformanceReview>
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PerformanceReviewCollectionResult"/> class.
+    /// </summary>
+    public PerformanceReviewCollectionResult() { }
+    
+    /// <summary>
+    /// Initializes a new instance of the <see cref="PerformanceReviewCollectionResult"/> class with <paramref name="paging"/>.
+    /// </summary>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public PerformanceReviewCollectionResult(PagingArgs? paging) : base(paging) { }
+    
     /// <summary>
-    /// Represents the <c>PerformanceReview</c> collection result.
+    /// Initializes a new instance of the <see cref="PerformanceReviewCollectionResult"/> class with <paramref name="items"/> to add.
     /// </summary>
-    public class PerformanceReviewCollectionResult : CollectionResult<PerformanceReviewCollection, PerformanceReview>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PerformanceReviewCollectionResult"/> class.
-        /// </summary>
-        public PerformanceReviewCollectionResult() { }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PerformanceReviewCollectionResult"/> class with <paramref name="paging"/>.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public PerformanceReviewCollectionResult(PagingArgs? paging) : base(paging) { }
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PerformanceReviewCollectionResult"/> class with <paramref name="items"/> to add.
-        /// </summary>
-        /// <param name="items">The items to add.</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public PerformanceReviewCollectionResult(IEnumerable<PerformanceReview> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
-    }
-}
\ No newline at end of file
+    /// <param name="items">The items to add.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public PerformanceReviewCollectionResult(IEnumerable<PerformanceReview> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
+}
diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/RelationshipType.cs b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/RelationshipType.cs
index 203a0e225..da1ac5141 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/RelationshipType.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/RelationshipType.cs
@@ -2,22 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace MyEf.Hr.Common.Entities;
 
-namespace MyEf.Hr.Common.Entities
-{
-    /// <summary>
-    /// Represents the Relationship Type entity.
-    /// </summary>
-    public partial class RelationshipType : ReferenceDataBase<Guid> { }
+/// <summary>
+/// Represents the Relationship Type entity.
+/// </summary>
+public partial class RelationshipType : ReferenceDataBase<Guid> { }
 
-    /// <summary>
-    /// Represents the <c>RelationshipType</c> collection.
-    /// </summary>
-    public partial class RelationshipTypeCollection : List<RelationshipType> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the <c>RelationshipType</c> collection.
+/// </summary>
+public partial class RelationshipTypeCollection : List<RelationshipType> { }
diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/TerminationDetail.cs b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/TerminationDetail.cs
index 712ba3c7d..741a4dda6 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/TerminationDetail.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/TerminationDetail.cs
@@ -2,32 +2,25 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
+namespace MyEf.Hr.Common.Entities;
 
-namespace MyEf.Hr.Common.Entities
+/// <summary>
+/// Represents the Termination Detail entity.
+/// </summary>
+public partial class TerminationDetail
 {
     /// <summary>
-    /// Represents the Termination Detail entity.
+    /// Gets or sets the Date.
     /// </summary>
-    public partial class TerminationDetail
-    {
-        /// <summary>
-        /// Gets or sets the Date.
-        /// </summary>
-        public DateTime Date { get; set; }
+    public DateTime Date { get; set; }
 
-        /// <summary>
-        /// Gets the corresponding <c>Reason</c> text (read-only where selected).
-        /// </summary>
-        public string? ReasonText { get; set; }
+    /// <summary>
+    /// Gets the corresponding <c>Reason</c> text (read-only where selected).
+    /// </summary>
+    public string? ReasonText { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Reason code.
-        /// </summary>
-        public string? Reason { get; set; }
-    }
-}
\ No newline at end of file
+    /// <summary>
+    /// Gets or sets the Reason code.
+    /// </summary>
+    public string? Reason { get; set; }
+}
diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/TerminationReason.cs b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/TerminationReason.cs
index 5673b7a42..0efafe8f4 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/TerminationReason.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/TerminationReason.cs
@@ -2,22 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace MyEf.Hr.Common.Entities;
 
-namespace MyEf.Hr.Common.Entities
-{
-    /// <summary>
-    /// Represents the Termination Reason entity.
-    /// </summary>
-    public partial class TerminationReason : ReferenceDataBase<Guid> { }
+/// <summary>
+/// Represents the Termination Reason entity.
+/// </summary>
+public partial class TerminationReason : ReferenceDataBase<Guid> { }
 
-    /// <summary>
-    /// Represents the <c>TerminationReason</c> collection.
-    /// </summary>
-    public partial class TerminationReasonCollection : List<TerminationReason> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the <c>TerminationReason</c> collection.
+/// </summary>
+public partial class TerminationReasonCollection : List<TerminationReason> { }
diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/USState.cs b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/USState.cs
index 977e77989..7fece7522 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/USState.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/USState.cs
@@ -2,22 +2,14 @@
  * This file is automatically generated; any changes will be lost. 
  */
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-using CoreEx.RefData;
+namespace MyEf.Hr.Common.Entities;
 
-namespace MyEf.Hr.Common.Entities
-{
-    /// <summary>
-    /// Represents the US State entity.
-    /// </summary>
-    public partial class USState : ReferenceDataBase<Guid> { }
+/// <summary>
+/// Represents the US State entity.
+/// </summary>
+public partial class USState : ReferenceDataBase<Guid> { }
 
-    /// <summary>
-    /// Represents the <c>USState</c> collection.
-    /// </summary>
-    public partial class USStateCollection : List<USState> { }
-}
\ No newline at end of file
+/// <summary>
+/// Represents the <c>USState</c> collection.
+/// </summary>
+public partial class USStateCollection : List<USState> { }
diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/GlobalUsings.cs b/samples/MyEf.Hr/MyEf.Hr.Common/GlobalUsings.cs
new file mode 100644
index 000000000..de1022ab0
--- /dev/null
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/GlobalUsings.cs
@@ -0,0 +1,13 @@
+global using CoreEx.Entities;
+global using CoreEx.Http;
+global using CoreEx.Json;
+global using CoreEx.RefData;
+global using System;
+global using System.Collections.Generic;
+global using System.Diagnostics.CodeAnalysis;
+global using System.Text.Json.Serialization;
+global using System.Net.Http;
+global using System.Threading;
+global using System.Threading.Tasks;
+global using MyEf.Hr.Common.Entities;
+global using RefDataNamespace = MyEf.Hr.Common.Entities;
\ No newline at end of file
diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/MyEf.Hr.Common.csproj b/samples/MyEf.Hr/MyEf.Hr.Common/MyEf.Hr.Common.csproj
index 9f5217397..bb7037712 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/MyEf.Hr.Common.csproj
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/MyEf.Hr.Common.csproj
@@ -3,6 +3,8 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <LangVersion>Preview</LangVersion>
+    <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="CoreEx" Version="3.27.1" />
diff --git a/templates/Beef.Template.Solution/Beef.Template.Solution.csproj b/templates/Beef.Template.Solution/Beef.Template.Solution.csproj
index c82dcef3b..7cdab7e32 100644
--- a/templates/Beef.Template.Solution/Beef.Template.Solution.csproj
+++ b/templates/Beef.Template.Solution/Beef.Template.Solution.csproj
@@ -19,6 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Remove="content\Company.AppName.Common\GlobalUsings.cs" />
     <None Remove="content\Company.AppName.Services.Test\appsettings.unittest.json" />
     <None Remove="content\Company.AppName.Services.Test\Company.AppName.Services.Test.csproj" />
     <None Remove="content\Company.AppName.Services.Test\Data\Data.yaml" />
diff --git a/templates/Beef.Template.Solution/content/.template.config/template.json b/templates/Beef.Template.Solution/content/.template.config/template.json
index 354581c36..0851327ad 100644
--- a/templates/Beef.Template.Solution/content/.template.config/template.json
+++ b/templates/Beef.Template.Solution/content/.template.config/template.json
@@ -93,7 +93,7 @@
       "type": "generated",
       "generator": "constant",
       "parameters": {
-        "value": "5.16.2"
+        "value": "5.17.0"
       },
       "replaces": "BeefVersion"
     },
diff --git a/templates/Beef.Template.Solution/content/Company.AppName.Common/Company.AppName.Common.csproj b/templates/Beef.Template.Solution/content/Company.AppName.Common/Company.AppName.Common.csproj
index aa454b4fc..d7714d7b3 100644
--- a/templates/Beef.Template.Solution/content/Company.AppName.Common/Company.AppName.Common.csproj
+++ b/templates/Beef.Template.Solution/content/Company.AppName.Common/Company.AppName.Common.csproj
@@ -2,6 +2,8 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <Nullable>enable</Nullable>
+    <LangVersion>Preview</LangVersion>
+    <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="CoreEx" Version="CoreExVersion" />
diff --git a/templates/Beef.Template.Solution/content/Company.AppName.Common/GlobalUsings.cs b/templates/Beef.Template.Solution/content/Company.AppName.Common/GlobalUsings.cs
new file mode 100644
index 000000000..9961e3abc
--- /dev/null
+++ b/templates/Beef.Template.Solution/content/Company.AppName.Common/GlobalUsings.cs
@@ -0,0 +1,13 @@
+global using CoreEx.Entities;
+global using CoreEx.Http;
+global using CoreEx.Json;
+global using CoreEx.RefData;
+global using System;
+global using System.Collections.Generic;
+global using System.Diagnostics.CodeAnalysis;
+global using System.Text.Json.Serialization;
+global using System.Net.Http;
+global using System.Threading;
+global using System.Threading.Tasks;
+global using Company.AppName.Common.Entities;
+global using RefDataNamespace = Company.AppName.Common.Entities;
\ No newline at end of file
diff --git a/tools/Beef.CodeGen.Core/Config/Entity/CodeGenConfig.cs b/tools/Beef.CodeGen.Core/Config/Entity/CodeGenConfig.cs
index bfe9160c2..4c7a80886 100644
--- a/tools/Beef.CodeGen.Core/Config/Entity/CodeGenConfig.cs
+++ b/tools/Beef.CodeGen.Core/Config/Entity/CodeGenConfig.cs
@@ -38,8 +38,9 @@ namespace Beef.CodeGen.Config.Entity
     [CodeGenCategory("OData", Title = "Provides the _OData Data-layer_ configuration.")]
     [CodeGenCategory("HttpAgent", Title = "Provides the _HTTP Agent Data-layer_ configuration.")]
     [CodeGenCategory("gRPC", Title = "Provides the _gRPC_ configuration.")]
-    [CodeGenCategory("Path", Title = "Provides the _Path (Directory)_ configuration for the generated artefacts.")]
-    [CodeGenCategory("Namespace", Title = "Provides the _.NET Namespace_ configuration for the generated artefacts.")]
+    [CodeGenCategory("Path", Title = "Provides the _Path (Directory)_ configuration.")]
+    [CodeGenCategory("Namespace", Title = "Provides the _.NET Namespace_ configuration.")]
+    [CodeGenCategory("Auth", Title = "Provides the _Authorization_ configuration.")]
     [CodeGenCategory("Collections", Title = "Provides related child (hierarchical) configuration.")]
     public class CodeGenConfig : ConfigRootBase<CodeGenConfig>
     {
@@ -503,6 +504,38 @@ public class CodeGenConfig : ConfigRootBase<CodeGenConfig>
 
         #endregion
 
+        #region Auth
+
+        /// <summary>
+        /// Gets the default auth action for a create.
+        /// </summary>
+        [JsonPropertyName("authActionCreate")]
+        [CodeGenProperty("Auth", Title = "The default `Operation.AuthAction` for an `Operation.Type` of `Create`.", Description = "Defaults to `Create`.")]
+        public string? AuthActionCreate { get; set; }
+
+        /// <summary>
+        /// Gets the default auth action for a get or getcoll.
+        /// </summary>
+        [JsonPropertyName("authActionRead")]
+        [CodeGenProperty("Auth", Title = "The default `Operation.AuthAction` for an `Operation.Type` of `Get` or `GetColl`.", Description = "Defaults to `Read`.")]
+        public string? AuthActionRead { get; set; }
+
+        /// <summary>
+        /// Gets the default auth action for a update.
+        /// </summary>
+        [JsonPropertyName("authActionUpdate")]
+        [CodeGenProperty("Auth", Title = "The default `Operation.AuthAction` for an `Operation.Type` of `Update`.", Description = "Defaults to `Update`.")]
+        public string? AuthActionUpdate { get; set; }
+
+        /// <summary>
+        /// Gets the default auth action for a delete.
+        /// </summary>
+        [JsonPropertyName("authActionDelete")]
+        [CodeGenProperty("Auth", Title = "The default `Operation.AuthAction` for an `Operation.Type` of `Delete`.", Description = "Defaults to `Delete`.")]
+        public string? AuthActionDelete { get; set; }
+
+        #endregion
+
         /// <summary>
         /// Gets or sets the corresponding <see cref="EntityConfig"/> collection.
         /// </summary>
@@ -634,6 +667,11 @@ protected override async Task PrepareAsync()
             RefDataSortOrderDataName = DefaultWhereNull(RefDataSortOrderDataName, () => "SortOrder");
             WebApiTags ??= [];
 
+            AuthActionCreate = DefaultWhereNull(AuthActionCreate, () => "Create");
+            AuthActionRead = DefaultWhereNull(AuthActionRead, () => "Read");
+            AuthActionUpdate = DefaultWhereNull(AuthActionUpdate, () => "Update");
+            AuthActionDelete = DefaultWhereNull(AuthActionDelete, () => "Delete");
+
             if (!string.IsNullOrEmpty(WebApiRoutePrefix))
                 RefDataWebApiRoute = string.IsNullOrEmpty(RefDataWebApiRoute) ? WebApiRoutePrefix :
                     $"{(WebApiRoutePrefix.EndsWith('/') ? WebApiRoutePrefix[..^1] : WebApiRoutePrefix)}/{(RefDataWebApiRoute.StartsWith('/') ? RefDataWebApiRoute[1..] : RefDataWebApiRoute)}";
diff --git a/tools/Beef.CodeGen.Core/Config/Entity/EntityConfig.cs b/tools/Beef.CodeGen.Core/Config/Entity/EntityConfig.cs
index 3c5beb25c..bf5b3232d 100644
--- a/tools/Beef.CodeGen.Core/Config/Entity/EntityConfig.cs
+++ b/tools/Beef.CodeGen.Core/Config/Entity/EntityConfig.cs
@@ -1748,19 +1748,19 @@ private async Task PrepareOperationsAsync()
 
             // Add in selected operations where applicable (in reverse order in which output).
             if (CompareValue(Delete, true) && !Operations.Any(x => x.Name == "Delete"))
-                Operations.Insert(0, new OperationConfig { Name = "Delete", Type = "Delete", PrimaryKey = true, AuthAction = "Delete" });
+                Operations.Insert(0, new OperationConfig { Name = "Delete", Type = "Delete", PrimaryKey = true });
 
             if (CompareValue(Patch, true) && !Operations.Any(x => x.Name == "Patch"))
                 Operations.Insert(0, new OperationConfig { Name = "Patch", Type = "Patch", PrimaryKey = true });
 
             if (CompareValue(Update, true) && !Operations.Any(x => x.Name == "Update"))
-                Operations.Insert(0, new OperationConfig { Name = "Update", Type = "Update", PrimaryKey = true, AuthAction = "Update" });
+                Operations.Insert(0, new OperationConfig { Name = "Update", Type = "Update", PrimaryKey = true });
 
             if (CompareValue(Create, true) && !Operations.Any(x => x.Name == "Create"))
-                Operations.Insert(0, new OperationConfig { Name = "Create", Type = "Create", WebApiRoute = "", AuthAction = "Create" });
+                Operations.Insert(0, new OperationConfig { Name = "Create", Type = "Create", WebApiRoute = "" });
 
             if (CompareValue(Get, true) && !Operations.Any(x => x.Name == "Get"))
-                Operations.Insert(0, new OperationConfig { Name = "Get", Type = "Get", PrimaryKey = true, AuthAction = "Read" });
+                Operations.Insert(0, new OperationConfig { Name = "Get", Type = "Get", PrimaryKey = true });
 
             if (CompareValue(GetByArgs, true) && !Operations.Any(x => x.Name == "GetByArgs"))
             {
@@ -1771,10 +1771,10 @@ private async Task PrepareOperationsAsync()
             }
 
             if (CompareValue(GetAll, true) && !Operations.Any(x => x.Name == "GetAll"))
-                Operations.Insert(0, new OperationConfig { Name = "GetAll", Type = "GetColl", WebApiRoute = GetByArgs is not null && GetByArgs.Value ? "all" : "", AuthAction = "Read" });
+                Operations.Insert(0, new OperationConfig { Name = "GetAll", Type = "GetColl", WebApiRoute = GetByArgs is not null && GetByArgs.Value ? "all" : "" });
 
             if (CompareValue(GetByQuery, true) && !Operations.Any(x => x.Name == "GetByQuery"))
-                Operations.Insert(0, new OperationConfig { Name = "GetByQuery", Type = "GetColl", Paging = true, Query = true, WebApiRoute = "query", AuthAction = "Read" });
+                Operations.Insert(0, new OperationConfig { Name = "GetByQuery", Type = "GetColl", Paging = true, Query = true, WebApiRoute = "query" });
 
             // Prepare each operations.
             foreach (var operation in Operations)
diff --git a/tools/Beef.CodeGen.Core/Config/Entity/OperationConfig.cs b/tools/Beef.CodeGen.Core/Config/Entity/OperationConfig.cs
index ca429396a..cb5c0c01f 100644
--- a/tools/Beef.CodeGen.Core/Config/Entity/OperationConfig.cs
+++ b/tools/Beef.CodeGen.Core/Config/Entity/OperationConfig.cs
@@ -1148,6 +1148,15 @@ protected override async Task PrepareAsync()
                 _ => HasReturnValue ? $"A resultant {{{{{ReturnType}}}}}" : null
             })) + ".";
 
+            AuthAction = DefaultWhereNull(AuthAction, () => Type switch
+            {
+                "Get" or "GetColl" => Root!.AuthActionRead,
+                "Create" => Root!.AuthActionCreate,
+                "Update" => Root!.AuthActionUpdate,
+                "Delete" => Root!.AuthActionDelete,
+                _ => null
+            });
+
             WebApiReturnText = Type == "GetColl" ? StringConverter.ToComments($"The {{{{{BaseReturnType}Collection}}}}") : ReturnText;
 
             PrivateName = DefaultWhereNull(PrivateName, () => StringConverter.ToPrivateCase(Name));
diff --git a/tools/Beef.CodeGen.Core/Schema/entity.beef-5.json b/tools/Beef.CodeGen.Core/Schema/entity.beef-5.json
index 3786110ca..9dca65305 100644
--- a/tools/Beef.CodeGen.Core/Schema/entity.beef-5.json
+++ b/tools/Beef.CodeGen.Core/Schema/entity.beef-5.json
@@ -350,6 +350,26 @@
           "title": "The Namespace (root) for the Api-related .NET artefacts.",
           "description": "Defaults to \u0060NamespaceBase\u0060 \u002B \u0060.\u0060 \u002B \u0060ApiName\u0060 (runtime parameter). For example \u0060Beef.Demo.Api\u0060."
         },
+        "authActionCreate": {
+          "type": "string",
+          "title": "The default \u0060Operation.AuthAction\u0060 for an \u0060Operation.Type\u0060 of \u0060Create\u0060.",
+          "description": "Defaults to \u0060Create\u0060."
+        },
+        "authActionRead": {
+          "type": "string",
+          "title": "The default \u0060Operation.AuthAction\u0060 for an \u0060Operation.Type\u0060 of \u0060Get\u0060 or \u0060GetColl\u0060.",
+          "description": "Defaults to \u0060Read\u0060."
+        },
+        "authActionUpdate": {
+          "type": "string",
+          "title": "The default \u0060Operation.AuthAction\u0060 for an \u0060Operation.Type\u0060 of \u0060Update\u0060.",
+          "description": "Defaults to \u0060Update\u0060."
+        },
+        "authActionDelete": {
+          "type": "string",
+          "title": "The default \u0060Operation.AuthAction\u0060 for an \u0060Operation.Type\u0060 of \u0060Delete\u0060.",
+          "description": "Defaults to \u0060Delete\u0060."
+        },
         "entities": {
           "type": "array",
           "title": "The corresponding \u0060Entity\u0060 collection.",
diff --git a/tools/Beef.CodeGen.Core/Templates/EntityIWebApiAgent_cs.hbs b/tools/Beef.CodeGen.Core/Templates/EntityIWebApiAgent_cs.hbs
index 8c5a045aa..35a643b5d 100644
--- a/tools/Beef.CodeGen.Core/Templates/EntityIWebApiAgent_cs.hbs
+++ b/tools/Beef.CodeGen.Core/Templates/EntityIWebApiAgent_cs.hbs
@@ -8,47 +8,31 @@
 #pragma warning disable
 
 {{/if}}
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using Microsoft.Extensions.Logging;
-using {{Root.NamespaceCommon}}.Entities;
-{{#ifval Root.RefDataCommonNamespace}}
-using RefDataNamespace = {{Root.RefDataCommonNamespace}};
-{{/ifval}}
+namespace {{Root.NamespaceCommon}}.Agents;
 
-namespace {{Root.NamespaceCommon}}.Agents
+/// <summary>
+/// Defines the {{{EntityNameSeeComments}}} HTTP agent.
+/// </summary>
+public partial interface I{{Name}}Agent
 {
-    /// <summary>
-    /// Defines the {{{EntityNameSeeComments}}} HTTP agent.
-    /// </summary>
-    public partial interface I{{Name}}Agent
-    {
 {{#each WebApiAgentOperations}}
   {{#unless @first}}
 
   {{/unless}}
-        /// <summary>
-        /// {{{SummaryText}}}
-        /// </summary>
+    /// <summary>
+    /// {{{SummaryText}}}
+    /// </summary>
   {{#ifeq Type 'Patch'}}
-        /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
+    /// <param name="patchOption">The <see cref="HttpPatchOption"/>.</param>
   {{/ifeq}}
   {{#each Parameters}}
-        /// <param name="{{ArgumentName}}">{{{WebApiSummaryText}}}</param>
+    /// <param name="{{ArgumentName}}">{{{WebApiSummaryText}}}</param>
   {{/each}}
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        {{{AgentOperationTaskReturnType}}} {{Name}}Async({{#ifeq Type 'Patch'}}HttpPatchOption patchOption, {{/ifeq}}{{#each Parameters}}{{{WebApiAgentParameterType}}} {{ArgumentName}}{{#ifor IsPagingArgs IsQueryArgs}} = null{{/ifor}}, {{/each}}HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    {{{AgentOperationTaskReturnType}}} {{Name}}Async({{#ifeq Type 'Patch'}}HttpPatchOption patchOption, {{/ifeq}}{{#each Parameters}}{{{WebApiAgentParameterType}}} {{ArgumentName}}{{#ifor IsPagingArgs IsQueryArgs}} = null{{/ifor}}, {{/each}}HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 {{/each}}
-    }
 }{{#if Root.PreprocessorDirectives}}
 
 #pragma warning restore
diff --git a/tools/Beef.CodeGen.Core/Templates/EntityWebApiAgent_cs.hbs b/tools/Beef.CodeGen.Core/Templates/EntityWebApiAgent_cs.hbs
index a2f38c39a..a60efd966 100644
--- a/tools/Beef.CodeGen.Core/Templates/EntityWebApiAgent_cs.hbs
+++ b/tools/Beef.CodeGen.Core/Templates/EntityWebApiAgent_cs.hbs
@@ -8,40 +8,26 @@
 #pragma warning disable
 
 {{/if}}
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using {{Root.NamespaceCommon}}.Entities;
-{{#ifval Root.RefDataCommonNamespace}}
-using RefDataNamespace = {{Root.RefDataCommonNamespace}};
-{{/ifval}}
+namespace {{Root.NamespaceCommon}}.Agents;
 
-namespace {{Root.NamespaceCommon}}.Agents
+/// <summary>
+/// Provides the {{{EntityNameSeeComments}}} HTTP agent.
+/// </summary>
+public partial class {{Name}}Agent : TypedHttpClientBase<{{Name}}Agent>, I{{Name}}Agent
 {
     /// <summary>
-    /// Provides the {{{EntityNameSeeComments}}} HTTP agent.
+    /// Initializes a new instance of the <see cref="{{Name}}Agent"/> class.
     /// </summary>
-    public partial class {{Name}}Agent : TypedHttpClientBase<{{Name}}Agent>, I{{Name}}Agent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="{{Name}}Agent"/> class.
-        /// </summary>
-        /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
-        /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
-        public {{Name}}Agent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
+    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
+    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
+    /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
+    public {{Name}}Agent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
 {{#each WebApiAgentOperations}}
 
-        /// <inheritdoc/>
-        public {{{AgentOperationTaskReturnType}}} {{Name}}Async({{#ifeq Type 'Patch'}}HttpPatchOption patchOption, {{/ifeq}}{{#each Parameters}}{{{WebApiAgentParameterType}}} {{ArgumentName}}{{#ifor IsPagingArgs IsQueryArgs}} = null{{/ifor}}, {{/each}}HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => {{AgentOperationHttpMethod}}("{{AgentWebApiRoute}}", {{#ifeq Type 'Patch'}}patchOption, {{/ifeq}}{{#if HasValue}}{{ValueParameter.ArgumentName}}, {{/if}}requestOptions: requestOptions{{#if Query}}.IncludeQuery(query){{/if}}{{#if Paging}}.IncludePaging(paging){{/if}}{{#ifne ValueLessParameters.Count 0}}, args: HttpArgs.Create({{#each CoreParameters}}{{#unless @first}}, {{/unless}}new HttpArg<{{{WebApiAgentParameterType}}}>("{{ArgumentName}}", {{ArgumentName}}{{#ifval WebApiAgentFrom}}, HttpArgType.{{WebApiAgentFrom}}{{/ifval}}){{/each}}){{/ifne}}, cancellationToken: cancellationToken);
+    /// <inheritdoc/>
+    public {{{AgentOperationTaskReturnType}}} {{Name}}Async({{#ifeq Type 'Patch'}}HttpPatchOption patchOption, {{/ifeq}}{{#each Parameters}}{{{WebApiAgentParameterType}}} {{ArgumentName}}{{#ifor IsPagingArgs IsQueryArgs}} = null{{/ifor}}, {{/each}}HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => {{AgentOperationHttpMethod}}("{{AgentWebApiRoute}}", {{#ifeq Type 'Patch'}}patchOption, {{/ifeq}}{{#if HasValue}}{{ValueParameter.ArgumentName}}, {{/if}}requestOptions: requestOptions{{#if Query}}.IncludeQuery(query){{/if}}{{#if Paging}}.IncludePaging(paging){{/if}}{{#ifne ValueLessParameters.Count 0}}, args: HttpArgs.Create({{#each CoreParameters}}{{#unless @first}}, {{/unless}}new HttpArg<{{{WebApiAgentParameterType}}}>("{{ArgumentName}}", {{ArgumentName}}{{#ifval WebApiAgentFrom}}, HttpArgType.{{WebApiAgentFrom}}{{/ifval}}){{/each}}){{/ifne}}, cancellationToken: cancellationToken);
 {{/each}}
-    }
 }{{#if Root.PreprocessorDirectives}}
 
 #pragma warning restore
diff --git a/tools/Beef.CodeGen.Core/Templates/Model_cs.hbs b/tools/Beef.CodeGen.Core/Templates/Model_cs.hbs
index b7f61cd92..93c5e5ef8 100644
--- a/tools/Beef.CodeGen.Core/Templates/Model_cs.hbs
+++ b/tools/Beef.CodeGen.Core/Templates/Model_cs.hbs
@@ -7,48 +7,23 @@
 #nullable enable
 #pragma warning disable
 
-{{/if}}
-{{! ===== Using ===== }}
-{{#unless Root.IsDataModel}}
-using System;{{set-value 'HasUsingStatement' true}}
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json.Serialization;
-using CoreEx.Entities;
-  {{#ifval RefDataType}}
-using CoreEx.RefData;
-  {{/ifval}}
-{{/unless}}
-{{#unless Root.IsDataModel}}
-  {{#if Root.UsingNamespace1}}
-using {{Root.UsingNamespace1}};{{set-value 'HasUsingStatement' true}}
-  {{/if}}
-  {{#if Root.UsingNamespace2}}
-using {{Root.UsingNamespace2}};{{set-value 'HasUsingStatement' true}}
-  {{/if}}
-  {{#if Root.UsingNamespace3}}
-using {{Root.UsingNamespace3}};{{set-value 'HasUsingStatement' true}}
-  {{/if}}
-{{/unless}}
-{{#if HasUsingStatement}}
-
 {{/if}}
 {{! ===== Class ===== }}
-namespace {{#if Root.IsDataModel}}{{Root.NamespaceBusiness}}.Data.Model{{else}}{{#ifeq Root.RuntimeEntityScope 'Common'}}{{Root.NamespaceCommon}}{{else}}{{Root.NamespaceBusiness}}{{/ifeq}}.Entities{{/if}}
-{
-    /// <summary>
-    /// {{#if Root.IsDataModel}}{{ModelSummaryText}}{{else}}{{#ifeq Root.RuntimeEntityScope 'Common'}}{{sanitize-comments SummaryText}}{{else}}{{SummaryText}}{{/ifeq}}{{/if}}
-    /// </summary>
+namespace {{#if Root.IsDataModel}}{{Root.NamespaceBusiness}}.Data.Model{{else}}{{#ifeq Root.RuntimeEntityScope 'Common'}}{{Root.NamespaceCommon}}{{else}}{{Root.NamespaceBusiness}}{{/ifeq}}.Entities{{/if}};
+
+/// <summary>
+/// {{#if Root.IsDataModel}}{{ModelSummaryText}}{{else}}{{#ifeq Root.RuntimeEntityScope 'Common'}}{{sanitize-comments SummaryText}}{{else}}{{SummaryText}}{{/ifeq}}{{/if}}
+/// </summary>
 {{#if Root.IsDataModel}}
-    public {{#if Abstract}}abstract {{/if}}partial class {{{EntityName}}}{{#ifval DataModelInherits}} : {{{DataModelInherits}}}{{/ifval}}{{#ifval ModelImplements}}{{#ifval DataModelInherits}}, {{else}} : {{/ifval}}{{{ModelImplements}}}{{/ifval}}{{#ifval RefDataType}}{{#ifeq CoreProperties.Count 0}} { }{{/ifeq}}{{/ifval}}
+public {{#if Abstract}}abstract {{/if}}partial class {{{EntityName}}}{{#ifval DataModelInherits}} : {{{DataModelInherits}}}{{/ifval}}{{#ifval ModelImplements}}{{#ifval DataModelInherits}}, {{else}} : {{/ifval}}{{{ModelImplements}}}{{/ifval}}{{#ifval RefDataType}}{{#ifeq CoreProperties.Count 0}} { }{{/ifeq}}{{/ifval}}
 {{else}}
-    public {{#if Abstract}}abstract {{/if}}partial class {{{EntityName}}}{{#ifval ModelInherits}} : {{{ModelInherits}}}{{/ifval}}{{#ifval CommonImplements}}{{#ifval ModelInherits}}, {{else}} : {{/ifval}}{{{CommonImplements}}}{{/ifval}}{{#ifval RefDataType}}{{#ifeq CoreProperties.Count 0}} { }{{/ifeq}}{{/ifval}}
+public {{#if Abstract}}abstract {{/if}}partial class {{{EntityName}}}{{#ifval ModelInherits}} : {{{ModelInherits}}}{{/ifval}}{{#ifval CommonImplements}}{{#ifval ModelInherits}}, {{else}} : {{/ifval}}{{{CommonImplements}}}{{/ifval}}{{#ifval RefDataType}}{{#ifeq CoreProperties.Count 0}} { }{{/ifeq}}{{/ifval}}
 {{/if}}
 {{#ifnull RefDataType}}
-    {
+{
 {{else}}
   {{#ifne CoreProperties.Count 0}}
-    {
+{
   {{/ifne}}
 {{/ifnull}}
 {{! ===== Properties ===== }}
@@ -61,101 +36,101 @@ namespace {{#if Root.IsDataModel}}{{Root.NamespaceBusiness}}.Data.Model{{else}}{
       {{#unless RefDataList}}
         {{#unless Root.IsDataModel}}
           {{#ifeq RefDataText 'Optional' 'Always'}}
-        /// <summary>
-        /// {{#ifeq Root.RuntimeEntityScope 'Common'}}{{sanitize-comments SummaryRefDataText}}{{else}}{{SummaryRefDataText}}{{/ifeq}}
-        /// </summary>
+    /// <summary>
+    /// {{#ifeq Root.RuntimeEntityScope 'Common'}}{{sanitize-comments SummaryRefDataText}}{{else}}{{SummaryRefDataText}}{{/ifeq}}
+    /// </summary>
             {{#ifval JsonName}}
               {{#ifeq Parent.JsonSerializer 'Newtonsoft'}}
-        [Newtonsoft.Json.JsonProperty("{{#if Root.IsDataModel}}{{JsonDataModelName}}{{else}}{{JsonName}}{{/if}}Text")]
+    [Newtonsoft.Json.JsonProperty("{{#if Root.IsDataModel}}{{JsonDataModelName}}{{else}}{{JsonName}}{{/if}}Text")]
               {{/ifeq}}
-        [JsonPropertyName("{{#if Root.IsDataModel}}{{JsonDataModelName}}{{else}}{{JsonName}}{{/if}}Text")]
+    [JsonPropertyName("{{#if Root.IsDataModel}}{{JsonDataModelName}}{{else}}{{JsonName}}{{/if}}Text")]
             {{/ifval}}
-        public string? {{RefDataTextName}} { get; set; }
+    public string? {{RefDataTextName}} { get; set; }
 
           {{/ifeq}}
         {{/unless}}
       {{/unless}}
     {{/unless}}
   {{/ifval}}
-        /// <summary>
-        /// {{#ifeq Root.RuntimeEntityScope 'Common'}}{{sanitize-comments ModelSummaryText}}{{else}}{{ModelSummaryText}}{{/ifeq}}
-        /// </summary>
+    /// <summary>
+    /// {{#ifeq Root.RuntimeEntityScope 'Common'}}{{sanitize-comments ModelSummaryText}}{{else}}{{ModelSummaryText}}{{/ifeq}}
+    /// </summary>
   {{#if Root.IsDataModel}}   
     {{#if DataModelSerializationIgnore}}
       {{#ifeq Parent.JsonSerializer 'Newtonsoft'}}
-        [Newtonsoft.Json.JsonIgnore]
+    [Newtonsoft.Json.JsonIgnore]
       {{/ifeq}}
-        [JsonIgnore]
+    [JsonIgnore]
     {{else}}
       {{#ifval JsonDataModelName}}
         {{#ifeq Parent.JsonSerializer 'Newtonsoft'}}
-        [Newtonsoft.Json.JsonProperty("{{JsonDataModelName}}"{{#if SerializationAlwaysInclude}}, DefaultValueHandling.Include{{/if}})]
+    [Newtonsoft.Json.JsonProperty("{{JsonDataModelName}}"{{#if SerializationAlwaysInclude}}, DefaultValueHandling.Include{{/if}})]
         {{/ifeq}}
-        [JsonPropertyName("{{JsonDataModelName}}")]
+    [JsonPropertyName("{{JsonDataModelName}}")]
       {{/ifval}}
       {{#if SerializationAlwaysInclude}}
         {{#ifeq Parent.JsonSerializer 'Newtonsoft'}}
-        [Newtonsoft.Json.JsonIgnore(Condition=JsonIgnoreCondition.Never)]
+    [Newtonsoft.Json.JsonIgnore(Condition=JsonIgnoreCondition.Never)]
         {{/ifeq}}
-        [JsonProperty({{#if SerializationAlwaysInclude}}DefaultValueHandling.Include{{/if}})]
+    [JsonProperty({{#if SerializationAlwaysInclude}}DefaultValueHandling.Include{{/if}})]
       {{/if}}
     {{/if}}
   {{else}}
     {{#if SerializationIgnore}}
       {{#ifeq Parent.JsonSerializer 'Newtonsoft'}}
-        [Newtonsoft.Json.JsonIgnore]
+    [Newtonsoft.Json.JsonIgnore]
       {{/ifeq}}
-        [JsonIgnore]
+    [JsonIgnore]
     {{else}}
       {{#ifval JsonName}}
         {{#ifeq Parent.JsonSerializer 'Newtonsoft'}}
-        [JsonProperty("{{JsonName}}"{{#if SerializationAlwaysInclude}}, DefaultValueHandling.Include{{/if}})]
+    [JsonProperty("{{JsonName}}"{{#if SerializationAlwaysInclude}}, DefaultValueHandling.Include{{/if}})]
         {{else}}
-        [JsonPropertyName("{{JsonName}}")]
+    [JsonPropertyName("{{JsonName}}")]
         {{/ifeq}}
       {{/ifval}}
       {{#if SerializationAlwaysInclude}}
         {{#ifeq Parent.JsonSerializer 'Newtonsoft'}}
-        [JsonProperty({{#if SerializationAlwaysInclude}}DefaultValueHandling.Include{{/if}})]
+    [JsonProperty({{#if SerializationAlwaysInclude}}DefaultValueHandling.Include{{/if}})]
         {{/ifeq}}
-        [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
       {{/if}}
     {{/if}}
   {{/if}}
     {{#unless Root.IsDataModel}}
       {{#ifval Annotation1}}
-        {{Annotation1}}
+    {{Annotation1}}
       {{/ifval}}
       {{#ifval Annotation2}}
-        {{Annotation2}}
+    {{Annotation2}}
       {{/ifval}}
       {{#ifval Annotation3}}
-        {{Annotation3}}
+    {{Annotation3}}
       {{/ifval}}
     {{/unless}}
-        public {{{ModelType}}} {{Name}} { get; set; }
+    public {{{ModelType}}} {{Name}} { get; set; }
 {{/each}}
 {{#unless HasIdentifier}}
   {{#unless RefDataType}}
     {{#ifne PrimaryKeyProperties.Count 0}}
         
-        /// <summary>
-        /// Creates the primary <see cref="CompositeKey"/>.
-        /// </summary>
-        /// <returns>The primary <see cref="CompositeKey"/>.</returns>
+    /// <summary>
+    /// Creates the primary <see cref="CompositeKey"/>.
+    /// </summary>
+    /// <returns>The primary <see cref="CompositeKey"/>.</returns>
     {{#each PrimaryKeyProperties}}
-        /// <param name="{{ArgumentName}}">The {{{PropertyNameSeeComments}}}.</param>
+    /// <param name="{{ArgumentName}}">The {{{PropertyNameSeeComments}}}.</param>
     {{/each}}
         public static CompositeKey CreatePrimaryKey({{#each PrimaryKeyProperties}}{{#unless @first}}, {{/unless}}{{{PrivateType}}} {{ArgumentName}}{{/each}}) => CompositeKey.Create({{#each PrimaryKeyProperties}}{{#unless @first}}, {{/unless}}{{ArgumentName}}{{/each}});
 
-        /// <summary>
-        /// Gets the primary <see cref="CompositeKey"/> (consists of the following property(s): {{#each PrimaryKeyProperties}}{{#unless @first}}, {{/unless}}{{{PropertyNameSeeComments}}}{{/each}}).
-        /// </summary>
+    /// <summary>
+    /// Gets the primary <see cref="CompositeKey"/> (consists of the following property(s): {{#each PrimaryKeyProperties}}{{#unless @first}}, {{/unless}}{{{PropertyNameSeeComments}}}{{/each}}).
+    /// </summary>
       {{#ifeq JsonSerializer 'Newtonsoft'}}
-        [Newtonsoft.Json.JsonIgnore]
+    [Newtonsoft.Json.JsonIgnore]
       {{/ifeq}}
-        [JsonIgnore]
-        public CompositeKey PrimaryKey => CreatePrimaryKey({{#each PrimaryKeyProperties}}{{#unless @first}}, {{/unless}}{{Name}}{{/each}});
+    [JsonIgnore]
+    public CompositeKey PrimaryKey => CreatePrimaryKey({{#each PrimaryKeyProperties}}{{#unless @first}}, {{/unless}}{{Name}}{{/each}});
     {{/ifne}}
   {{/unless}}
 {{/unless}}
@@ -163,70 +138,69 @@ namespace {{#if Root.IsDataModel}}{{Root.NamespaceBusiness}}.Data.Model{{else}}{
 {{#unless RefDataType}}
   {{#ifne PartitionKeyProperties.Count 0}}
         
-        /// <summary>
-        /// Creates the <see cref="IPartitionKey.PartitionKey"/>.
-        /// </summary>
-        /// <returns>The partition key.</returns>
+    /// <summary>
+    /// Creates the <see cref="IPartitionKey.PartitionKey"/>.
+    /// </summary>
+    /// <returns>The partition key.</returns>
   {{#each PartitionKeyProperties}}
-        /// <param name="{{ArgumentName}}">The {{{PropertyNameSeeComments}}}.</param>
+    /// <param name="{{ArgumentName}}">The {{{PropertyNameSeeComments}}}.</param>
   {{/each}}
-        public static string? CreatePartitionKey({{#each PartitionKeyProperties}}{{#unless @first}}, {{/unless}}{{{PrivateType}}} {{ArgumentName}}{{/each}}) => CompositeKey.Create({{#each PartitionKeyProperties}}{{#unless @first}}, {{/unless}}{{ArgumentName}}{{/each}}).ToString();
+    public static string? CreatePartitionKey({{#each PartitionKeyProperties}}{{#unless @first}}, {{/unless}}{{{PrivateType}}} {{ArgumentName}}{{/each}}) => CompositeKey.Create({{#each PartitionKeyProperties}}{{#unless @first}}, {{/unless}}{{ArgumentName}}{{/each}}).ToString();
 
-        /// <summary>
-        /// Gets the Partition Key (consists of the following property(s): {{#each PartitionKeyProperties}}{{#unless @first}}, {{/unless}}{{{PropertyNameSeeComments}}}{{/each}}).
-        /// </summary>
+    /// <summary>
+    /// Gets the Partition Key (consists of the following property(s): {{#each PartitionKeyProperties}}{{#unless @first}}, {{/unless}}{{{PropertyNameSeeComments}}}{{/each}}).
+    /// </summary>
     {{#ifeq JsonSerializer 'Newtonsoft'}}
-        [Newtonsoft.Json.JsonIgnore]
+    [Newtonsoft.Json.JsonIgnore]
     {{/ifeq}}
-        [JsonIgnore]
-        public string? PartitionKey => CreatePartitionKey({{#each PartitionKeyProperties}}{{#unless @first}}, {{/unless}}{{Name}}{{/each}});
+    [JsonIgnore]
+    public string? PartitionKey => CreatePartitionKey({{#each PartitionKeyProperties}}{{#unless @first}}, {{/unless}}{{Name}}{{/each}});
   {{/ifne}}
 {{/unless}}
 {{/if}}
 {{#ifnull RefDataType}}
-    }
+}
 {{else}}
   {{#ifne CoreProperties.Count 0}}
-    }
+}
   {{/ifne}}
 {{/ifnull}}
 {{! ===== Collection ===== }}
 {{#if Collection}}
 
-    /// <summary>
-    /// Represents the {{#ifeq Root.RuntimeEntityScope 'Common'}}{{sanitize-comments EntityNameSeeComments}}{{else}}{{EntityNameSeeComments}}{{/ifeq}} collection.
-    /// </summary>
-    public partial class {{{EntityCollectionName}}} : {{{CollectionInherits}}} { }
+/// <summary>
+/// Represents the {{#ifeq Root.RuntimeEntityScope 'Common'}}{{sanitize-comments EntityNameSeeComments}}{{else}}{{EntityNameSeeComments}}{{/ifeq}} collection.
+/// </summary>
+public partial class {{{EntityCollectionName}}} : {{{CollectionInherits}}} { }
 {{/if}}
 {{#if CollectionResult}}
   {{#unless Root.IsDataModel}}
 
+/// <summary>
+/// Represents the {{#ifeq Root.RuntimeEntityScope 'Common'}}{{sanitize-comments EntityNameSeeComments}}{{else}}{{EntityNameSeeComments}}{{/ifeq}} collection result.
+/// </summary>
+public class {{{EntityCollectionResultName}}} : {{{CollectionResultInherits}}}
+{
     /// <summary>
-    /// Represents the {{#ifeq Root.RuntimeEntityScope 'Common'}}{{sanitize-comments EntityNameSeeComments}}{{else}}{{EntityNameSeeComments}}{{/ifeq}} collection result.
+    /// Initializes a new instance of the {{{see-comments EntityCollectionResultName}}} class.
     /// </summary>
-    public class {{{EntityCollectionResultName}}} : {{{CollectionResultInherits}}}
-    {
-        /// <summary>
-        /// Initializes a new instance of the {{{see-comments EntityCollectionResultName}}} class.
-        /// </summary>
-        public {{{EntityCollectionResultName}}}() { }
-        
-        /// <summary>
-        /// Initializes a new instance of the {{{see-comments EntityCollectionResultName}}} class with <paramref name="paging"/>.
-        /// </summary>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public {{{EntityCollectionResultName}}}(PagingArgs? paging) : base(paging) { }
-        
-        /// <summary>
-        /// Initializes a new instance of the {{{see-comments EntityCollectionResultName}}} class with <paramref name="items"/> to add.
-        /// </summary>
-        /// <param name="items">The items to add.</param>
-        /// <param name="paging">The <see cref="PagingArgs"/>.</param>
-        public {{{EntityCollectionResultName}}}(IEnumerable<{{{EntityName}}}> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
-    }
+    public {{{EntityCollectionResultName}}}() { }
+    
+    /// <summary>
+    /// Initializes a new instance of the {{{see-comments EntityCollectionResultName}}} class with <paramref name="paging"/>.
+    /// </summary>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public {{{EntityCollectionResultName}}}(PagingArgs? paging) : base(paging) { }
+    
+    /// <summary>
+    /// Initializes a new instance of the {{{see-comments EntityCollectionResultName}}} class with <paramref name="items"/> to add.
+    /// </summary>
+    /// <param name="items">The items to add.</param>
+    /// <param name="paging">The <see cref="PagingArgs"/>.</param>
+    public {{{EntityCollectionResultName}}}(IEnumerable<{{{EntityName}}}> items, PagingArgs? paging = null) : base(paging) => Items.AddRange(items);
+}
   {{/unless}}
-{{/if}}
-}{{#if Root.PreprocessorDirectives}}
+{{/if}}{{#if Root.PreprocessorDirectives}}
 
 #pragma warning restore
 #nullable restore{{/if}}
\ No newline at end of file
diff --git a/tools/Beef.CodeGen.Core/Templates/ReferenceDataIWebApiAgent_cs.hbs b/tools/Beef.CodeGen.Core/Templates/ReferenceDataIWebApiAgent_cs.hbs
index 2e434aaab..7987a8633 100644
--- a/tools/Beef.CodeGen.Core/Templates/ReferenceDataIWebApiAgent_cs.hbs
+++ b/tools/Beef.CodeGen.Core/Templates/ReferenceDataIWebApiAgent_cs.hbs
@@ -7,50 +7,33 @@
 #pragma warning disable
 
 {{/if}}
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Configuration;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using CoreEx.RefData;
-using Microsoft.Extensions.Logging;
-using {{Root.NamespaceCommon}}.Entities;
-{{#ifval Root.RefDataCommonNamespace}}
-using RefDataNamespace = {{Root.RefDataCommonNamespace}};
-{{/ifval}}
+namespace {{Root.NamespaceCommon}}.Agents;
 
-namespace {{Root.NamespaceCommon}}.Agents
+/// <summary>
+/// Defines the <b>ReferenceData</b> HTTP agent.
+/// </summary>
+public partial interface IReferenceDataAgent
 {
+{{#each RefDataEntities}}
     /// <summary>
-    /// Defines the <b>ReferenceData</b> HTTP agent.
+    /// Gets all of the {{see-comments RefDataQualifiedEntityName}} items that match the filter arguments.
     /// </summary>
-    public partial interface IReferenceDataAgent
-    {
-{{#each RefDataEntities}}
-        /// <summary>
-        /// Gets all of the {{see-comments RefDataQualifiedEntityName}} items that match the filter arguments.
-        /// </summary>
-        /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        Task<HttpResult<{{RefDataQualifiedEntityCollectionName}}>> {{Name}}GetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
+    /// <param name="args">The optional <see cref="ReferenceDataFilter"/> arguments.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    Task<HttpResult<{{RefDataQualifiedEntityCollectionName}}>> {{Name}}GetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 
 {{/each}}
-        /// <summary>
-        /// Gets the reference data entries for the specified entities and codes from the query string; e.g: {{RefDataWebApiRoute}}?entity=codeX,codeY&amp;entity2=codeZ&amp;entity3
-        /// </summary>
-        /// <param name="names">The optional list of reference data names.</param>
-        /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
-        /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
-        /// <returns>A <see cref="HttpResult"/>.</returns>
-        /// <remarks>The reference data objects will need to be manually extracted from the corresponding response content.</remarks>
-        Task<HttpResult> GetNamedAsync(string[] names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
-    }
+    /// <summary>
+    /// Gets the reference data entries for the specified entities and codes from the query string; e.g: {{RefDataWebApiRoute}}?entity=codeX,codeY&amp;entity2=codeZ&amp;entity3
+    /// </summary>
+    /// <param name="names">The optional list of reference data names.</param>
+    /// <param name="requestOptions">The optional <see cref="HttpRequestOptions"/>.</param>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
+    /// <returns>A <see cref="HttpResult"/>.</returns>
+    /// <remarks>The reference data objects will need to be manually extracted from the corresponding response content.</remarks>
+    Task<HttpResult> GetNamedAsync(string[] names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default);
 }{{#if Root.PreprocessorDirectives}}
 
 #pragma warning restore
diff --git a/tools/Beef.CodeGen.Core/Templates/ReferenceDataWebApiAgent_cs.hbs b/tools/Beef.CodeGen.Core/Templates/ReferenceDataWebApiAgent_cs.hbs
index fb1de3a71..d18de2faa 100644
--- a/tools/Beef.CodeGen.Core/Templates/ReferenceDataWebApiAgent_cs.hbs
+++ b/tools/Beef.CodeGen.Core/Templates/ReferenceDataWebApiAgent_cs.hbs
@@ -7,50 +7,35 @@
 #pragma warning disable
 
 {{/if}}
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using CoreEx.Entities;
-using CoreEx.Http;
-using CoreEx.Json;
-using CoreEx.RefData;
-using {{Root.NamespaceCommon}}.Entities;
-{{#ifval Root.RefDataCommonNamespace}}
-using RefDataNamespace = {{Root.RefDataCommonNamespace}};
-{{/ifval}}
+namespace {{Root.NamespaceCommon}}.Agents;
 
-namespace {{Root.NamespaceCommon}}.Agents
+/// <summary>
+/// Provides the <b>ReferenceData</b> HTTP agent.
+/// </summary>
+public partial class ReferenceDataAgent : TypedHttpClientBase<ReferenceDataAgent>, IReferenceDataAgent
 {
     /// <summary>
-    /// Provides the <b>ReferenceData</b> HTTP agent.
+    /// Initializes a new instance of the <see cref="ReferenceDataAgent"/> class.
     /// </summary>
-    public partial class ReferenceDataAgent : TypedHttpClientBase<ReferenceDataAgent>, IReferenceDataAgent
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ReferenceDataAgent"/> class.
-        /// </summary>
-        /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
-        /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
-        /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
-        public ReferenceDataAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
+    /// <param name="client">The underlying <see cref="HttpClient"/>.</param>
+    /// <param name="jsonSerializer">The optional <see cref="IJsonSerializer"/>.</param>
+    /// <param name="executionContext">The optional <see cref="CoreEx.ExecutionContext"/>.</param>
+    public ReferenceDataAgent(HttpClient client, IJsonSerializer? jsonSerializer = null, CoreEx.ExecutionContext? executionContext = null) : base(client, jsonSerializer, executionContext) { }
 
 {{#each RefDataEntities}}
-        /// <inheritdoc/>
-        public Task<HttpResult<{{RefDataQualifiedEntityCollectionName}}>> {{Name}}GetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-            => GetAsync<{{RefDataQualifiedEntityCollectionName}}>("{{WebApiRoutePrefix}}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
+    /// <inheritdoc/>
+    public Task<HttpResult<{{RefDataQualifiedEntityCollectionName}}>> {{Name}}GetAllAsync(ReferenceDataFilter? args = null, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+        => GetAsync<{{RefDataQualifiedEntityCollectionName}}>("{{WebApiRoutePrefix}}", requestOptions: requestOptions, args: HttpArgs.Create(new HttpArg<ReferenceDataFilter>("args", args!, HttpArgType.FromUriUseProperties)), cancellationToken);      
 
 {{/each}}
-        /// <inheritdoc/>
-        public Task<HttpResult> GetNamedAsync(string[] names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
-        {
-            var ro = requestOptions ?? new HttpRequestOptions();
-            if (names != null)
-                ro.UrlQueryString += string.Join("&", names);
-                
-            return GetAsync("{{Root.RefDataWebApiRoute}}", ro, null, cancellationToken);
-        }
+    /// <inheritdoc/>
+    public Task<HttpResult> GetNamedAsync(string[] names, HttpRequestOptions? requestOptions = null, CancellationToken cancellationToken = default)
+    {
+        var ro = requestOptions ?? new HttpRequestOptions();
+        if (names != null)
+            ro.UrlQueryString += string.Join("&", names);
+            
+        return GetAsync("{{Root.RefDataWebApiRoute}}", ro, null, cancellationToken);
     }
 }{{#if Root.PreprocessorDirectives}}