diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffd9ed56d..fb7efddd1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,20 +2,29 @@
 
 Represents the **NuGet** versions.
 
+## v5.13.0
+- *Enhancement:* Added `dotnet run openapi` option to perform *basic* parsing of an [OpenAPI](https://spec.openapis.org/oas/latest.html) document generating the corresponding `Entity`, `Operation` and `Property` configuration into a temporary YAML file. The contents are expected to then be copied and pasted into the appropriate YAML destination and further configured as necessary.
+  - Execute `dotnet run -- --help` to see all command-line capabilities for this.
+  - All OpenAPI paths (operations) are generated into a single `Service` entity; this can be further split into multiple entities manually as required.
+  - Where a schema (entity) is specified more than once with the same name it will attempt to match the configuration (including properties) to an existing entity and reuse; otherwise, a new entity will be created with a postfix number to ensure uniqueness.
+  - The `OpenApiArgs` supports further options to enable additional customization of processing and generated output; this is set using the `CodeGenConsole.WithOpenApiArgs` method. 
+  - _Note:_ this is in _preview_ until explicitly noted in a later version; as such, the generated YAML will require manual review and adjustment as required and may not support all features (for some time or ever). This is only intended to help accelerate the initial configuration process where an OpenAPI document is available.
+- *Fixed*: Sanitize the generated `Api.Controller` and `Common` summary text comments to remove internal references, etc.
+
 ## v5.12.9
 - *Fixed:* Enable `text` specification to be used as-is by prefixing with a `+` plus-sign character. 
 - *Fixed:* Upgraded `DbEx` (`v2.5.8`) to include all related fixes and improvements.
 
 ## v5.12.8
-- *Fixed*: Fixed the model code-generation by allowing the `ModelInherits` to be specified within the `Entity` YAML configuration to override the default.
-- *Fixed*: Fixed `dotnet run count` to exclude paths that start with `.` (dot) to avoid including hidden files in the count.
+- *Fixed:* Fixed the model code-generation by allowing the `ModelInherits` to be specified within the `Entity` YAML configuration to override the default.
+- *Fixed:* Fixed `dotnet run count` to exclude paths that start with `.` (dot) to avoid including hidden files in the count.
 
 ## v5.12.7
-- *Fixed*: Fixes the model code-generation to auto implement the `ITenantId` and `ILogicallyDeleted` where corresponding properties are defined.
-- *Fixed*: Fixed the manager code-generation to output the `IdentifierGenerator` code where inheriting the `Id` property.
+- *Fixed:* Fixes the model code-generation to auto implement the `ITenantId` and `ILogicallyDeleted` where corresponding properties are defined.
+- *Fixed:* Fixed the manager code-generation to output the `IdentifierGenerator` code where inheriting the `Id` property.
 
 ## v5.12.6
-- *Fixed*: The EF Model generation has had the `ITenantId.TenantId` filtering removed as out-of-the-box EF caches first and uses resulting in an unexpected side-effect. The `CoreEx.EntityFramework` as of `v3.20.0` automatically includes tenant filtering to achieve the desired behavior.
+- *Fixed:* The EF Model generation has had the `ITenantId.TenantId` filtering removed as out-of-the-box EF caches first and uses resulting in an unexpected side-effect. The `CoreEx.EntityFramework` as of `v3.20.0` automatically includes tenant filtering to achieve the desired behavior.
 - *Fixed:* Upgraded `CoreEx` (`v3.20.0`) to include all related fixes and improvements.
 
 ## v5.12.5
diff --git a/Common.targets b/Common.targets
index 8f30a7860..923121b92 100644
--- a/Common.targets
+++ b/Common.targets
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>5.12.9</Version>
+		<Version>5.13.0</Version>
 		<LangVersion>preview</LangVersion>
 		<Authors>Avanade</Authors>
 		<Company>Avanade</Company>
@@ -27,6 +27,7 @@
     <IsPackable>true</IsPackable>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <LangVersion>preview</LangVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/docs/Entity-Entity-Config.md b/docs/Entity-Entity-Config.md
index c889a7a90..65c689aa0 100644
--- a/docs/Entity-Entity-Config.md
+++ b/docs/Entity-Entity-Config.md
@@ -215,7 +215,7 @@ Property | Description
 **`databaseName`** | The .NET database interface name (used where `AutoImplement` is `Database`).<br/>&dagger; Defaults to the `CodeGeneration.DatabaseName` configuration property (its default value is `IDatabase`).
 **`databaseSchema`** | The database schema name (used where `AutoImplement` is `Database`).<br/>&dagger; Defaults to `dbo`.
 `databaseMapperInheritsFrom` | The name of the `Mapper` that the generated Database `Mapper` inherits from.
-`databaseCustomerMapper` | Indicates that a custom Database `Mapper` will be used; i.e. not generated.<br/>&dagger; Otherwise, by default, a `Mapper` will be generated.
+`databaseCustomMapper` | Indicates that a custom Database `Mapper` will be used; i.e. not generated.<br/>&dagger; Otherwise, by default, a `Mapper` will be generated.
 `databaseMapperEx` | Indicates that a `DatabaseMapperEx` (extended/explicit) will be used; versus, `DatabaseMapper` (which uses Reflection internally).<br/>&dagger; Defaults to `CodeGeneration.DatabaseMapperEx` (its default value is `true`). The `DatabaseMapperEx` essentially replaces the `DatabaseMapper` as it is more performant; this option can be used where leagcy/existing behavior is required.
 
 <br/>
diff --git a/samples/Cdr.Banking/Cdr.Banking.Api/Cdr.Banking.Api.csproj b/samples/Cdr.Banking/Cdr.Banking.Api/Cdr.Banking.Api.csproj
index 083dfb1e5..396d03c4e 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Api/Cdr.Banking.Api.csproj
+++ b/samples/Cdr.Banking/Cdr.Banking.Api/Cdr.Banking.Api.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.21.0" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.21.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.6.2" />
   </ItemGroup>
   <ItemGroup>
diff --git a/samples/Cdr.Banking/Cdr.Banking.Api/Controllers/Generated/AccountController.cs b/samples/Cdr.Banking/Cdr.Banking.Api/Controllers/Generated/AccountController.cs
index 0ef301339..14abc37c4 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Api/Controllers/Generated/AccountController.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Api/Controllers/Generated/AccountController.cs
@@ -28,10 +28,10 @@ public AccountController(WebApi webApi, IAccountManager manager)
     /// <summary>
     /// Get all accounts.
     /// </summary>
-    /// <param name="productCategory">The Product Category (see <see cref="RefDataNamespace.ProductCategory"/>).</param>
-    /// <param name="openStatus">The Open Status (see <see cref="RefDataNamespace.OpenStatus"/>).</param>
+    /// <param name="productCategory">The Product Category.</param>
+    /// <param name="openStatus">The Open Status.</param>
     /// <param name="isOwned">Indicates whether Is Owned.</param>
-    /// <returns>The <see cref="AccountCollection"/></returns>
+    /// <returns>The <c>Account</c> array</returns>
     [Tags("Banking", "Accounts")]
     [HttpGet("api/v1/banking/accounts", Name="Account_GetAccounts")]
     [Paging]
@@ -44,10 +44,10 @@ public Task<IActionResult> GetAccounts([FromQuery(Name="product-category")] stri
     }
 
     /// <summary>
-    /// Get <see cref="AccountDetail"/>.
+    /// Get <c>AccountDetail</c>.
     /// </summary>
-    /// <param name="accountId">The <see cref="Account"/> identifier.</param>
-    /// <returns>The selected <see cref="AccountDetail"/> where found.</returns>
+    /// <param name="accountId">The <c>Account</c> identifier.</param>
+    /// <returns>The selected <c>AccountDetail</c> where found.</returns>
     [HttpGet("api/v1/banking/accounts/{accountId}", Name="Account_GetDetail")]
     [ProducesResponseType(typeof(Common.Entities.AccountDetail), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NotFound)]
@@ -55,10 +55,10 @@ public Task<IActionResult> GetDetail(string? accountId)
         => _webApi.GetWithResultAsync<AccountDetail?>(Request, p => _manager.GetDetailAsync(accountId));
 
     /// <summary>
-    /// Get <see cref="Account"/> <see cref="Balance"/>.
+    /// Get <c>Account</c> <c>Balance</c>.
     /// </summary>
-    /// <param name="accountId">The <see cref="Account"/> identifier.</param>
-    /// <returns>The selected <see cref="Balance"/> where found.</returns>
+    /// <param name="accountId">The <c>Account</c> identifier.</param>
+    /// <returns>The selected <c>Balance</c> where found.</returns>
     [HttpGet("api/v1/banking/accounts/{accountId}/balance", Name="Account_GetBalance")]
     [ProducesResponseType(typeof(Common.Entities.Balance), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NotFound)]
@@ -66,10 +66,10 @@ public Task<IActionResult> GetBalance(string? accountId)
         => _webApi.GetWithResultAsync<Balance?>(Request, p => _manager.GetBalanceAsync(accountId));
 
     /// <summary>
-    /// Get <see cref="Account"/> statement (file).
+    /// Get <c>Account</c> statement (file).
     /// </summary>
-    /// <param name="accountId">The <see cref="Account"/> identifier.</param>
-    /// <returns>A resultant <see cref="FileContentResult"/>.</returns>
+    /// <param name="accountId">The <c>Account</c> identifier.</param>
+    /// <returns>A resultant <c>FileContentResult</c>.</returns>
     [HttpGet("api/v1/banking/accounts/{accountId}/statement", Name="Account_GetStatement")]
     [Produces("text/plain")]
     [ProducesResponseType((int)HttpStatusCode.OK)]
diff --git a/samples/Cdr.Banking/Cdr.Banking.Api/Controllers/Generated/ReferenceDataController.cs b/samples/Cdr.Banking/Cdr.Banking.Api/Controllers/Generated/ReferenceDataController.cs
index c8fa84e27..402225d39 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Api/Controllers/Generated/ReferenceDataController.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Api/Controllers/Generated/ReferenceDataController.cs
@@ -25,66 +25,66 @@ public ReferenceDataController(ReferenceDataContentWebApi webApi, ReferenceDataO
         { _webApi = webApi.ThrowIfNull(); _orchestrator = orchestrator.ThrowIfNull(); }
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.OpenStatus"/> reference data items that match the specified criteria.
+    /// Gets all of the 'OpenStatus' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.OpenStatus collection.</returns>
+    /// <returns>The 'OpenStatus' array.</returns>
     [HttpGet("api/v1/ref/openstatuses", Name="ReferenceData_OpenStatusGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.OpenStatus>), (int)HttpStatusCode.OK)]
     public Task<IActionResult> OpenStatusGetAll([FromQuery] IEnumerable<string>? codes = default, string? text = default)
         => _webApi.GetAsync(Request, p => _orchestrator.GetWithFilterAsync<RefDataNamespace.OpenStatus>(codes, text, p.RequestOptions.IncludeInactive));
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.ProductCategory"/> reference data items that match the specified criteria.
+    /// Gets all of the 'ProductCategory' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.ProductCategory collection.</returns>
+    /// <returns>The 'ProductCategory' array.</returns>
     [HttpGet("api/v1/ref/productcategories", Name="ReferenceData_ProductCategoryGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.ProductCategory>), (int)HttpStatusCode.OK)]
     public Task<IActionResult> ProductCategoryGetAll([FromQuery] IEnumerable<string>? codes = default, string? text = default)
         => _webApi.GetAsync(Request, p => _orchestrator.GetWithFilterAsync<RefDataNamespace.ProductCategory>(codes, text, p.RequestOptions.IncludeInactive));
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.AccountUType"/> reference data items that match the specified criteria.
+    /// Gets all of the 'AccountUType' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.AccountUType collection.</returns>
+    /// <returns>The 'AccountUType' array.</returns>
     [HttpGet("api/v1/ref/accountutypes", Name="ReferenceData_AccountUTypeGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.AccountUType>), (int)HttpStatusCode.OK)]
     public Task<IActionResult> AccountUTypeGetAll([FromQuery] IEnumerable<string>? codes = default, string? text = default)
         => _webApi.GetAsync(Request, p => _orchestrator.GetWithFilterAsync<RefDataNamespace.AccountUType>(codes, text, p.RequestOptions.IncludeInactive));
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.MaturityInstructions"/> reference data items that match the specified criteria.
+    /// Gets all of the 'MaturityInstructions' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.MaturityInstructions collection.</returns>
+    /// <returns>The 'MaturityInstructions' array.</returns>
     [HttpGet("api/v1/ref/maturityinstructions", Name="ReferenceData_MaturityInstructionsGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.MaturityInstructions>), (int)HttpStatusCode.OK)]
     public Task<IActionResult> MaturityInstructionsGetAll([FromQuery] IEnumerable<string>? codes = default, string? text = default)
         => _webApi.GetAsync(Request, p => _orchestrator.GetWithFilterAsync<RefDataNamespace.MaturityInstructions>(codes, text, p.RequestOptions.IncludeInactive));
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.TransactionType"/> reference data items that match the specified criteria.
+    /// Gets all of the 'TransactionType' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.TransactionType collection.</returns>
+    /// <returns>The 'TransactionType' array.</returns>
     [HttpGet("api/v1/ref/transactiontypes", Name="ReferenceData_TransactionTypeGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.TransactionType>), (int)HttpStatusCode.OK)]
     public Task<IActionResult> TransactionTypeGetAll([FromQuery] IEnumerable<string>? codes = default, string? text = default)
         => _webApi.GetAsync(Request, p => _orchestrator.GetWithFilterAsync<RefDataNamespace.TransactionType>(codes, text, p.RequestOptions.IncludeInactive));
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.TransactionStatus"/> reference data items that match the specified criteria.
+    /// Gets all of the 'TransactionStatus' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.TransactionStatus collection.</returns>
+    /// <returns>The 'TransactionStatus' array.</returns>
     [HttpGet("api/v1/ref/transactionstatuses", Name="ReferenceData_TransactionStatusGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.TransactionStatus>), (int)HttpStatusCode.OK)]
     public Task<IActionResult> TransactionStatusGetAll([FromQuery] IEnumerable<string>? codes = default, string? text = default)
@@ -93,7 +93,7 @@ public Task<IActionResult> TransactionStatusGetAll([FromQuery] IEnumerable<strin
     /// <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>
-    /// <returns>A <see cref="ReferenceDataMultiDictionary"/>.</returns>
+    /// <returns>The 'ReferenceDataMultiDictionary'.</returns>
     [HttpGet("api/v1/ref", Name="ReferenceData_GetNamed")]
     [ProducesResponseType(typeof(CoreEx.RefData.ReferenceDataMultiDictionary), (int)HttpStatusCode.OK)]
     public Task<IActionResult> GetNamed() => _webApi.GetAsync(Request, p => _orchestrator.GetNamedAsync(p.RequestOptions));
diff --git a/samples/Cdr.Banking/Cdr.Banking.Api/Controllers/Generated/TransactionController.cs b/samples/Cdr.Banking/Cdr.Banking.Api/Controllers/Generated/TransactionController.cs
index 0863efd52..5a3daaaec 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Api/Controllers/Generated/TransactionController.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Api/Controllers/Generated/TransactionController.cs
@@ -33,7 +33,7 @@ public TransactionController(WebApi webApi, ITransactionManager manager)
     /// <param name="minAmount">The Min Amount.</param>
     /// <param name="maxAmount">The Max Amount.</param>
     /// <param name="text">The Text.</param>
-    /// <returns>The <see cref="TransactionCollection"/></returns>
+    /// <returns>The <c>Transaction</c> array</returns>
     [HttpGet("api/v1/banking/accounts/{accountId}/transactions", Name="Transaction_GetTransactions")]
     [Paging]
     [ProducesResponseType(typeof(Common.Entities.TransactionCollection), (int)HttpStatusCode.OK)]
diff --git a/samples/Cdr.Banking/Cdr.Banking.Business/Cdr.Banking.Business.csproj b/samples/Cdr.Banking/Cdr.Banking.Business/Cdr.Banking.Business.csproj
index e93d9137d..b227b8d39 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Business/Cdr.Banking.Business.csproj
+++ b/samples/Cdr.Banking/Cdr.Banking.Business/Cdr.Banking.Business.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
+    <LangVersion>preview</LangVersion>
     <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
@@ -11,8 +12,8 @@
     <Folder Include="DataSvc\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.21.0" />
-    <PackageReference Include="CoreEx.Cosmos" Version="3.21.0" />
-    <PackageReference Include="CoreEx.Validation" Version="3.21.0" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.21.1" />
+    <PackageReference Include="CoreEx.Cosmos" Version="3.21.1" />
+    <PackageReference Include="CoreEx.Validation" Version="3.21.1" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Cdr.Banking/Cdr.Banking.Business/Generated/ReferenceDataProvider.cs b/samples/Cdr.Banking/Cdr.Banking.Business/Generated/ReferenceDataProvider.cs
index ff066e2d5..1aa6cf8bf 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Business/Generated/ReferenceDataProvider.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Business/Generated/ReferenceDataProvider.cs
@@ -20,15 +20,15 @@ public partial class ReferenceDataProvider : IReferenceDataProvider
     partial void ReferenceDataProviderCtor(); // Enables the ReferenceDataProvider constructor to be extended.
 
     /// <inheritdoc/>
-    public Type[] Types => new Type[] 
-    {
+    public Type[] Types =>
+    [
         typeof(RefDataNamespace.OpenStatus),
         typeof(RefDataNamespace.ProductCategory),
         typeof(RefDataNamespace.AccountUType),
         typeof(RefDataNamespace.MaturityInstructions),
         typeof(RefDataNamespace.TransactionType),
         typeof(RefDataNamespace.TransactionStatus)
-    };
+    ];
 
     /// <inheritdoc/>
     public Task<Result<IReferenceDataCollection>> GetAsync(Type type, CancellationToken cancellationToken = default) => _dataService.GetAsync(type);
diff --git a/samples/Cdr.Banking/Cdr.Banking.CodeGen/Properties/launchSettings.json b/samples/Cdr.Banking/Cdr.Banking.CodeGen/Properties/launchSettings.json
index 2338319c9..7e531a089 100644
--- a/samples/Cdr.Banking/Cdr.Banking.CodeGen/Properties/launchSettings.json
+++ b/samples/Cdr.Banking/Cdr.Banking.CodeGen/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Cdr.Banking.CodeGen": {
       "commandName": "Project",
-      "commandLineArgs": "endpoints"
+      "commandLineArgs": "entity"
     }
   }
 }
\ 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 d697fc625..17294fee8 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Cdr.Banking.Common.csproj
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Cdr.Banking.Common.csproj
@@ -8,6 +8,6 @@
     <Folder Include="Entities\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.21.0" />
+    <PackageReference Include="CoreEx" Version="3.21.1" />
   </ItemGroup>
 </Project>
\ No newline at end of file
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 44a253477..38366f6f1 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/Account.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/Account.cs
@@ -63,12 +63,12 @@ public partial class Account : IIdentifier<string>
     }
 
     /// <summary>
-    /// Represents the <see cref="Account"/> collection.
+    /// Represents the <c>Account</c> collection.
     /// </summary>
     public partial class AccountCollection : List<Account> { }
 
     /// <summary>
-    /// Represents the <see cref="Account"/> collection result.
+    /// Represents the <c>Account</c> collection result.
     /// </summary>
     public class AccountCollectionResult : CollectionResult<AccountCollection, Account>
     {
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 738774a51..b013b7ebd 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/AccountArgs.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/AccountArgs.cs
@@ -11,7 +11,7 @@
 namespace Cdr.Banking.Common.Entities
 {
     /// <summary>
-    /// Represents the <see cref="Account"/> arguments entity.
+    /// Represents the <c>Account</c> arguments entity.
     /// </summary>
     public partial class AccountArgs
     {
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 b92a61e48..8b1656ad2 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/AccountDetail.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/AccountDetail.cs
@@ -11,7 +11,7 @@
 namespace Cdr.Banking.Common.Entities
 {
     /// <summary>
-    /// Represents the <see cref="Account"/> Detail entity.
+    /// Represents the <c>Account</c> Detail entity.
     /// </summary>
     public partial class AccountDetail : Account
     {
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 000d241e1..e1519663f 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/AccountUType.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/AccountUType.cs
@@ -17,7 +17,7 @@ namespace Cdr.Banking.Common.Entities
     public partial class AccountUType : ReferenceDataBase<Guid> { }
 
     /// <summary>
-    /// Represents the <see cref="AccountUType"/> collection.
+    /// Represents the <c>AccountUType</c> collection.
     /// </summary>
     public partial class AccountUTypeCollection : List<AccountUType> { }
 }
\ No newline at end of file
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 b580f82b7..a6a15bff3 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/Balance.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/Balance.cs
@@ -16,7 +16,7 @@ namespace Cdr.Banking.Common.Entities
     public partial class Balance : IIdentifier<string>
     {
         /// <summary>
-        /// Gets or sets the <see cref="Account"/> identifier.
+        /// Gets or sets the <c>Account</c> identifier.
         /// </summary>
         [JsonPropertyName("accountId")]
         public string? Id { 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 f42ecff5c..1a75eef82 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/BalancePurse.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/BalancePurse.cs
@@ -11,7 +11,7 @@
 namespace Cdr.Banking.Common.Entities
 {
     /// <summary>
-    /// Represents the <see cref="Balance"/> Purse entity.
+    /// Represents the <c>Balance</c> Purse entity.
     /// </summary>
     public partial class BalancePurse
     {
@@ -27,7 +27,7 @@ public partial class BalancePurse
     }
 
     /// <summary>
-    /// Represents the <see cref="BalancePurse"/> collection.
+    /// Represents the <c>BalancePurse</c> collection.
     /// </summary>
     public partial class BalancePurseCollection : List<BalancePurse> { }
 }
\ No newline at end of file
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 5ad4a9c0c..5d2176ae2 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/MaturityInstructions.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/MaturityInstructions.cs
@@ -17,7 +17,7 @@ namespace Cdr.Banking.Common.Entities
     public partial class MaturityInstructions : ReferenceDataBase<Guid> { }
 
     /// <summary>
-    /// Represents the <see cref="MaturityInstructions"/> collection.
+    /// Represents the <c>MaturityInstructions</c> collection.
     /// </summary>
     public partial class MaturityInstructionsCollection : List<MaturityInstructions> { }
 }
\ No newline at end of file
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 29d5e23b7..d7d4bca2c 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/OpenStatus.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/OpenStatus.cs
@@ -17,7 +17,7 @@ namespace Cdr.Banking.Common.Entities
     public partial class OpenStatus : ReferenceDataBase<Guid> { }
 
     /// <summary>
-    /// Represents the <see cref="OpenStatus"/> collection.
+    /// Represents the <c>OpenStatus</c> collection.
     /// </summary>
     public partial class OpenStatusCollection : List<OpenStatus> { }
 }
\ No newline at end of file
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 d885a1a87..755dca441 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/ProductCategory.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/ProductCategory.cs
@@ -17,7 +17,7 @@ namespace Cdr.Banking.Common.Entities
     public partial class ProductCategory : ReferenceDataBase<Guid> { }
 
     /// <summary>
-    /// Represents the <see cref="ProductCategory"/> collection.
+    /// Represents the <c>ProductCategory</c> collection.
     /// </summary>
     public partial class ProductCategoryCollection : List<ProductCategory> { }
 }
\ No newline at end of file
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 afa82c717..a9d826b2b 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/Transaction.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/Transaction.cs
@@ -16,7 +16,7 @@ namespace Cdr.Banking.Common.Entities
     public partial class Transaction : IIdentifier<string>
     {
         /// <summary>
-        /// Gets or sets the <see cref="Account"/> identifier.
+        /// Gets or sets the <c>Account</c> identifier.
         /// </summary>
         [JsonPropertyName("transactionId")]
         public string? Id { get; set; }
@@ -98,12 +98,12 @@ public partial class Transaction : IIdentifier<string>
     }
 
     /// <summary>
-    /// Represents the <see cref="Transaction"/> collection.
+    /// Represents the <c>Transaction</c> collection.
     /// </summary>
     public partial class TransactionCollection : List<Transaction> { }
 
     /// <summary>
-    /// Represents the <see cref="Transaction"/> collection result.
+    /// Represents the <c>Transaction</c> collection result.
     /// </summary>
     public class TransactionCollectionResult : CollectionResult<TransactionCollection, Transaction>
     {
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 e3dac0532..697bb61b7 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TransactionArgs.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TransactionArgs.cs
@@ -11,7 +11,7 @@
 namespace Cdr.Banking.Common.Entities
 {
     /// <summary>
-    /// Represents the <see cref="Transaction"/> Arguments entity.
+    /// Represents the <c>Transaction</c> Arguments entity.
     /// </summary>
     public partial class TransactionArgs
     {
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 83633a5cc..4832a473f 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TransactionStatus.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TransactionStatus.cs
@@ -17,7 +17,7 @@ namespace Cdr.Banking.Common.Entities
     public partial class TransactionStatus : ReferenceDataBase<Guid> { }
 
     /// <summary>
-    /// Represents the <see cref="TransactionStatus"/> collection.
+    /// Represents the <c>TransactionStatus</c> collection.
     /// </summary>
     public partial class TransactionStatusCollection : List<TransactionStatus> { }
 }
\ No newline at end of file
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 4d9713c47..9b13dbe2a 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TransactionType.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Entities/Generated/TransactionType.cs
@@ -17,7 +17,7 @@ namespace Cdr.Banking.Common.Entities
     public partial class TransactionType : ReferenceDataBase<Guid> { }
 
     /// <summary>
-    /// Represents the <see cref="TransactionType"/> collection.
+    /// Represents the <c>TransactionType</c> collection.
     /// </summary>
     public partial class TransactionTypeCollection : List<TransactionType> { }
 }
\ No newline at end of file
diff --git a/samples/Cdr.Banking/Cdr.Banking.Test/Cdr.Banking.Test.csproj b/samples/Cdr.Banking/Cdr.Banking.Test/Cdr.Banking.Test.csproj
index 289cef190..0594289b0 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Test/Cdr.Banking.Test.csproj
+++ b/samples/Cdr.Banking/Cdr.Banking.Test/Cdr.Banking.Test.csproj
@@ -39,7 +39,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.21.0" />
+    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.21.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Cdr.Banking/Cdr.Banking.Test/FixtureSetup.cs b/samples/Cdr.Banking/Cdr.Banking.Test/FixtureSetup.cs
index 67bdc1072..1811e6354 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Test/FixtureSetup.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Test/FixtureSetup.cs
@@ -54,7 +54,7 @@ public void OneTimeSetUp()
                     await _cosmosDb.Transactions.ImportBatchAsync(jdr, cancellationToken: ct).ConfigureAwait(false);
 
                     jdr = JsonDataReader.ParseYaml<FixtureSetUp>("RefData.yaml", new JsonDataReaderArgs(new CoreEx.Text.Json.ReferenceDataContentJsonSerializer()));
-                    await _cosmosDb.ImportValueBatchAsync("RefData", jdr, test.Services.GetRequiredService<CoreEx.RefData.ReferenceDataOrchestrator>().GetAllTypes(), cancellationToken: ct).ConfigureAwait(false);
+                    await _cosmosDb.ImportValueBatchAsync("RefData", jdr, CoreEx.RefData.ReferenceDataOrchestrator.GetAllTypesInNamespace<Business.Data.Model.Account>(), cancellationToken: ct).ConfigureAwait(false);
                 }
 
                 return true;
diff --git a/samples/Demo/Beef.Demo.Api/Beef.Demo.Api.csproj b/samples/Demo/Beef.Demo.Api/Beef.Demo.Api.csproj
index 2c0bd046e..3f2fe13c4 100644
--- a/samples/Demo/Beef.Demo.Api/Beef.Demo.Api.csproj
+++ b/samples/Demo/Beef.Demo.Api/Beef.Demo.Api.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.21.0" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.21.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
     <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.6.2" />
   </ItemGroup>
diff --git a/samples/Demo/Beef.Demo.Api/Controllers/Generated/ConfigController.cs b/samples/Demo/Beef.Demo.Api/Controllers/Generated/ConfigController.cs
index 98d784bdb..74ba610d0 100644
--- a/samples/Demo/Beef.Demo.Api/Controllers/Generated/ConfigController.cs
+++ b/samples/Demo/Beef.Demo.Api/Controllers/Generated/ConfigController.cs
@@ -30,7 +30,7 @@ public ConfigController(WebApi webApi, IConfigManager manager)
     /// <summary>
     /// Get Env Vars.
     /// </summary>
-    /// <returns>A resultant <see cref="System.Collections.IDictionary"/>.</returns>
+    /// <returns>A resultant <c>System.Collections.IDictionary</c>.</returns>
     [HttpPost("api/v1/envvars", Name="Config_GetEnvVars")]
     [ProducesResponseType(typeof(System.Collections.IDictionary), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NoContent)]
diff --git a/samples/Demo/Beef.Demo.Api/Controllers/Generated/ContactController.cs b/samples/Demo/Beef.Demo.Api/Controllers/Generated/ContactController.cs
index 452729acd..a10eac53f 100644
--- a/samples/Demo/Beef.Demo.Api/Controllers/Generated/ContactController.cs
+++ b/samples/Demo/Beef.Demo.Api/Controllers/Generated/ContactController.cs
@@ -31,9 +31,9 @@ public ContactController(WebApi webApi, IContactManager manager, Microsoft.Exten
     partial void ContactControllerCtor(); // Enables additional functionality to be added to the constructor.
 
     /// <summary>
-    /// Gets the <see cref="ContactCollectionResult"/> that contains the items that match the selection criteria.
+    /// Gets the <c>Contact</c> array that contains the items that match the selection criteria.
     /// </summary>
-    /// <returns>The <see cref="ContactCollection"/></returns>
+    /// <returns>The <c>Contact</c> array</returns>
     [HttpGet("api/v1/contacts", Name="Contact_GetAll")]
     [ProducesResponseType(typeof(Common.Entities.ContactCollection), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NoContent)]
@@ -41,10 +41,10 @@ public Task<IActionResult> GetAll()
         => _webApi.GetAsync<ContactCollectionResult>(Request, p => _manager.GetAllAsync(), alternateStatusCode: HttpStatusCode.NoContent);
 
     /// <summary>
-    /// Gets the specified <see cref="Contact"/>.
+    /// Gets the specified <c>Contact</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Contact"/> identifier.</param>
-    /// <returns>The selected <see cref="Contact"/> where found.</returns>
+    /// <param name="id">The <c>Contact</c> identifier.</param>
+    /// <returns>The selected <c>Contact</c> where found.</returns>
     [HttpGet("api/v1/contacts/{id}", Name="Contact_Get")]
     [ProducesResponseType(typeof(Common.Entities.Contact), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NotFound)]
@@ -52,9 +52,9 @@ public Task<IActionResult> Get(Guid id)
         => _webApi.GetAsync<Contact?>(Request, p => _manager.GetAsync(id));
 
     /// <summary>
-    /// Creates a new <see cref="Contact"/>.
+    /// Creates a new <c>Contact</c>.
     /// </summary>
-    /// <returns>The created <see cref="Contact"/>.</returns>
+    /// <returns>The created <c>Contact</c>.</returns>
     [HttpPost("api/v1/contacts", Name="Contact_Create")]
     [AcceptsBody(typeof(Common.Entities.Contact))]
     [ProducesResponseType(typeof(Common.Entities.Contact), (int)HttpStatusCode.Created)]
@@ -62,10 +62,10 @@ public Task<IActionResult> Create()
         => _webApi.PostAsync<Contact, Contact>(Request, p => _manager.CreateAsync(p.Value!), statusCode: HttpStatusCode.Created);
 
     /// <summary>
-    /// Updates an existing <see cref="Contact"/>.
+    /// Updates an existing <c>Contact</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Contact"/> identifier.</param>
-    /// <returns>The updated <see cref="Contact"/>.</returns>
+    /// <param name="id">The <c>Contact</c> identifier.</param>
+    /// <returns>The updated <c>Contact</c>.</returns>
     [HttpPut("api/v1/contacts/{id}", Name="Contact_Update")]
     [AcceptsBody(typeof(Common.Entities.Contact))]
     [ProducesResponseType(typeof(Common.Entities.Contact), (int)HttpStatusCode.OK)]
@@ -74,10 +74,10 @@ public Task<IActionResult> Update(Guid id)
         => _webApi.PutAsync<Contact, Contact>(Request, p => _manager.UpdateAsync(p.Value!, id));
 
     /// <summary>
-    /// Patches an existing <see cref="Contact"/>.
+    /// Patches an existing <c>Contact</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Contact"/> identifier.</param>
-    /// <returns>The patched <see cref="Contact"/>.</returns>
+    /// <param name="id">The <c>Contact</c> identifier.</param>
+    /// <returns>The patched <c>Contact</c>.</returns>
     [HttpPatch("api/v1/contacts/{id}", Name="Contact_Patch")]
     [AcceptsBody(typeof(Common.Entities.Contact), HttpConsts.MergePatchMediaTypeName)]
     [ProducesResponseType(typeof(Common.Entities.Contact), (int)HttpStatusCode.OK)]
@@ -86,9 +86,9 @@ public Task<IActionResult> Patch(Guid id)
         => _webApi.PatchAsync<Contact>(Request, get: _ => _manager.GetAsync(id), put: p => _manager.UpdateAsync(p.Value!, id));
 
     /// <summary>
-    /// Deletes the specified <see cref="Contact"/>.
+    /// Deletes the specified <c>Contact</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Contact"/> identifier.</param>
+    /// <param name="id">The <c>Contact</c> identifier.</param>
     [HttpDelete("api/v1/contacts/{id}", Name="Contact_Delete")]
     [ProducesResponseType((int)HttpStatusCode.NoContent)]
     public Task<IActionResult> Delete(Guid id)
diff --git a/samples/Demo/Beef.Demo.Api/Controllers/Generated/GenderController.cs b/samples/Demo/Beef.Demo.Api/Controllers/Generated/GenderController.cs
index 4560d3a54..3e772f2c2 100644
--- a/samples/Demo/Beef.Demo.Api/Controllers/Generated/GenderController.cs
+++ b/samples/Demo/Beef.Demo.Api/Controllers/Generated/GenderController.cs
@@ -29,10 +29,10 @@ public GenderController(ReferenceDataContentWebApi webApi, IGenderManager manage
     partial void GenderControllerCtor(); // Enables additional functionality to be added to the constructor.
 
     /// <summary>
-    /// Gets the specified <see cref="Gender"/>.
+    /// Gets the specified <c>Gender</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Gender"/> identifier.</param>
-    /// <returns>The selected <see cref="Gender"/> where found.</returns>
+    /// <param name="id">The <c>Gender</c> identifier.</param>
+    /// <returns>The selected <c>Gender</c> where found.</returns>
     [HttpGet("api/v1/demo/ref/genders/{id}", Name="Gender_Get")]
     [ProducesResponseType(typeof(Common.Entities.Gender), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NotFound)]
@@ -40,9 +40,9 @@ public Task<IActionResult> Get(Guid id)
         => _webApi.GetWithResultAsync<Gender?>(Request, p => _manager.GetAsync(id));
 
     /// <summary>
-    /// Creates a new <see cref="Gender"/>.
+    /// Creates a new <c>Gender</c>.
     /// </summary>
-    /// <returns>The created <see cref="Gender"/>.</returns>
+    /// <returns>The created <c>Gender</c>.</returns>
     [HttpPost("api/v1/demo/ref/genders", Name="Gender_Create")]
     [AcceptsBody(typeof(Common.Entities.Gender))]
     [ProducesResponseType(typeof(Common.Entities.Gender), (int)HttpStatusCode.Created)]
@@ -50,10 +50,10 @@ public Task<IActionResult> Create()
         => _webApi.PostWithResultAsync<Gender, Gender>(Request, p => _manager.CreateAsync(p.Value!), statusCode: HttpStatusCode.Created);
 
     /// <summary>
-    /// Updates an existing <see cref="Gender"/>.
+    /// Updates an existing <c>Gender</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Gender"/> identifier.</param>
-    /// <returns>The updated <see cref="Gender"/>.</returns>
+    /// <param name="id">The <c>Gender</c> identifier.</param>
+    /// <returns>The updated <c>Gender</c>.</returns>
     [HttpPut("api/v1/demo/ref/genders/{id}", Name="Gender_Update")]
     [AcceptsBody(typeof(Common.Entities.Gender))]
     [ProducesResponseType(typeof(Common.Entities.Gender), (int)HttpStatusCode.OK)]
diff --git a/samples/Demo/Beef.Demo.Api/Controllers/Generated/PersonController.cs b/samples/Demo/Beef.Demo.Api/Controllers/Generated/PersonController.cs
index a7b831805..0bc909e79 100644
--- a/samples/Demo/Beef.Demo.Api/Controllers/Generated/PersonController.cs
+++ b/samples/Demo/Beef.Demo.Api/Controllers/Generated/PersonController.cs
@@ -32,9 +32,9 @@ public PersonController(WebApi webApi, IPersonManager manager, IPersonManager pe
     partial void PersonControllerCtor(); // Enables additional functionality to be added to the constructor.
 
     /// <summary>
-    /// Creates a new <see cref="Person"/>.
+    /// Creates a new <c>Person</c>.
     /// </summary>
-    /// <returns>The created <see cref="Person"/>.</returns>
+    /// <returns>The created <c>Person</c>.</returns>
     [HttpPost("api/v1/persons", Name="Person_Create")]
     [AcceptsBody(typeof(Common.Entities.Person))]
     [ProducesResponseType(typeof(Common.Entities.Person), (int)HttpStatusCode.Created)]
@@ -42,19 +42,19 @@ public Task<IActionResult> Create()
         => _webApi.PostAsync<Person, Person>(Request, p => _manager.CreateAsync(p.Value!), statusCode: HttpStatusCode.Created, locationUri: r => new Uri($"/api/v1/persons/{r.Id}", UriKind.Relative));
 
     /// <summary>
-    /// Deletes the specified <see cref="Person"/>.
+    /// Deletes the specified <c>Person</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Person"/> identifier.</param>
+    /// <param name="id">The <c>Person</c> identifier.</param>
     [HttpDelete("api/v1/persons/{id}", Name="Person_Delete")]
     [ProducesResponseType((int)HttpStatusCode.NoContent)]
     public Task<IActionResult> Delete(Guid id)
         => _webApi.DeleteAsync(Request, p => _manager.DeleteAsync(id));
 
     /// <summary>
-    /// Gets the specified <see cref="Person"/>.
+    /// Gets the specified <c>Person</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Person"/> identifier.</param>
-    /// <returns>The selected <see cref="Person"/> where found.</returns>
+    /// <param name="id">The <c>Person</c> identifier.</param>
+    /// <returns>The selected <c>Person</c> where found.</returns>
     [HttpGet("api/v1/persons/{id}", Name="Person_Get")]
     [ProducesResponseType(typeof(Common.Entities.Person), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NotFound)]
@@ -62,10 +62,10 @@ public Task<IActionResult> Get(Guid id)
         => _webApi.GetAsync<Person?>(Request, p => _manager.GetAsync(id));
 
     /// <summary>
-    /// Gets the specified <see cref="Person"/>.
+    /// Gets the specified <c>Person</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Person"/> identifier.</param>
-    /// <returns>The selected <see cref="Person"/> where found.</returns>
+    /// <param name="id">The <c>Person</c> identifier.</param>
+    /// <returns>The selected <c>Person</c> where found.</returns>
     [HttpGet("api/v1/persons/ex/{id}", Name="Person_GetEx")]
     [ProducesResponseType(typeof(Common.Entities.Person), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NotFound)]
@@ -73,10 +73,10 @@ public Task<IActionResult> GetEx(Guid id)
         => _webApi.GetAsync<Person?>(Request, p => _manager.GetExAsync(id));
 
     /// <summary>
-    /// Updates an existing <see cref="Person"/>.
+    /// Updates an existing <c>Person</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Person"/> identifier.</param>
-    /// <returns>The updated <see cref="Person"/>.</returns>
+    /// <param name="id">The <c>Person</c> identifier.</param>
+    /// <returns>The updated <c>Person</c>.</returns>
     [HttpPut("api/v1/persons/{id}", Name="Person_Update")]
     [AcceptsBody(typeof(Common.Entities.Person))]
     [ProducesResponseType(typeof(Common.Entities.Person), (int)HttpStatusCode.OK)]
@@ -85,10 +85,10 @@ public Task<IActionResult> Update(Guid id)
         => _webApi.PutAsync<Person, Person>(Request, p => _manager.UpdateAsync(p.Value!, id));
 
     /// <summary>
-    /// Updates an existing <see cref="Person"/>.
+    /// Updates an existing <c>Person</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Person"/> identifier.</param>
-    /// <returns>The updated <see cref="Person"/>.</returns>
+    /// <param name="id">The <c>Person</c> identifier.</param>
+    /// <returns>The updated <c>Person</c>.</returns>
     [HttpPut("api/v1/persons/withRollback/{id}", Name="Person_UpdateWithRollback")]
     [AcceptsBody(typeof(Common.Entities.Person))]
     [ProducesResponseType(typeof(Common.Entities.Person), (int)HttpStatusCode.OK)]
@@ -97,10 +97,10 @@ public Task<IActionResult> UpdateWithRollback(Guid id)
         => _webApi.PutAsync<Person, Person>(Request, p => _manager.UpdateWithRollbackAsync(p.Value!, id));
 
     /// <summary>
-    /// Patches an existing <see cref="Person"/>.
+    /// Patches an existing <c>Person</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Person"/> identifier.</param>
-    /// <returns>The patched <see cref="Person"/>.</returns>
+    /// <param name="id">The <c>Person</c> identifier.</param>
+    /// <returns>The patched <c>Person</c>.</returns>
     [HttpPatch("api/v1/persons/{id}", Name="Person_Patch")]
     [AcceptsBody(typeof(Common.Entities.Person), HttpConsts.MergePatchMediaTypeName)]
     [ProducesResponseType(typeof(Common.Entities.Person), (int)HttpStatusCode.OK)]
@@ -109,9 +109,9 @@ public Task<IActionResult> Patch(Guid id)
         => _webApi.PatchAsync<Person>(Request, get: _ => _manager.GetAsync(id), put: p => _manager.UpdateAsync(p.Value!, id));
 
     /// <summary>
-    /// Gets the <see cref="PersonCollectionResult"/> that contains the items that match the selection criteria.
+    /// Gets the <c>Person</c> array that contains the items that match the selection criteria.
     /// </summary>
-    /// <returns>The <see cref="PersonCollection"/></returns>
+    /// <returns>The <c>Person</c> array</returns>
     [Tags("apples", "oranges")]
     [HttpGet("api/v1/persons/all", Name="Person_GetAll")]
     [Paging]
@@ -121,9 +121,9 @@ public Task<IActionResult> GetAll()
         => _webApi.GetAsync<PersonCollectionResult>(Request, p => _manager.GetAllAsync(p.RequestOptions.Paging), alternateStatusCode: HttpStatusCode.NoContent);
 
     /// <summary>
-    /// Gets the <see cref="PersonCollectionResult"/> that contains the items that match the selection criteria.
+    /// Gets the <c>Person</c> array that contains the items that match the selection criteria.
     /// </summary>
-    /// <returns>The <see cref="PersonCollection"/></returns>
+    /// <returns>The <c>Person</c> array</returns>
     [HttpGet("api/v1/persons/allnopaging", Name="Person_GetAll2")]
     [ProducesResponseType(typeof(Common.Entities.PersonCollection), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NoContent)]
@@ -131,13 +131,13 @@ public Task<IActionResult> GetAll2()
         => _webApi.GetAsync<PersonCollectionResult>(Request, p => _manager.GetAll2Async(), alternateStatusCode: HttpStatusCode.NoContent);
 
     /// <summary>
-    /// Gets the <see cref="PersonCollectionResult"/> that contains the items that match the selection criteria.
+    /// Gets the <c>Person</c> array that contains the items that match the selection criteria.
     /// </summary>
     /// <param name="firstName">The First Name.</param>
     /// <param name="lastName">The Last Name.</param>
-    /// <param name="genders">The Genders (see <see cref="RefDataNamespace.Gender"/>).</param>
+    /// <param name="genders">The Genders.</param>
     /// <param name="orderBy">The Order By.</param>
-    /// <returns>The <see cref="PersonCollection"/></returns>
+    /// <returns>The <c>Person</c> array</returns>
     [HttpGet("api/v1/persons", Name="Person_GetByArgs")]
     [Paging]
     [ProducesResponseType(typeof(Common.Entities.PersonCollection), (int)HttpStatusCode.OK)]
@@ -149,13 +149,13 @@ public Task<IActionResult> GetByArgs(string? firstName = default, string? lastNa
     }
 
     /// <summary>
-    /// Gets the <see cref="PersonDetailCollectionResult"/> that contains the items that match the selection criteria.
+    /// Gets the <c>PersonDetail</c> array that contains the items that match the selection criteria.
     /// </summary>
     /// <param name="firstName">The First Name.</param>
     /// <param name="lastName">The Last Name.</param>
-    /// <param name="genders">The Genders (see <see cref="RefDataNamespace.Gender"/>).</param>
+    /// <param name="genders">The Genders.</param>
     /// <param name="orderBy">The Order By.</param>
-    /// <returns>The <see cref="PersonDetailCollection"/></returns>
+    /// <returns>The <c>PersonDetail</c> array</returns>
     [HttpGet("api/v1/persons/argsdetail", Name="Person_GetDetailByArgs")]
     [Paging]
     [ProducesResponseType(typeof(Common.Entities.PersonDetailCollection), (int)HttpStatusCode.OK)]
@@ -167,11 +167,11 @@ public Task<IActionResult> GetDetailByArgs(string? firstName = default, string?
     }
 
     /// <summary>
-    /// Merge first <see cref="Person"/> into second.
+    /// Merge first <c>Person</c> into second.
     /// </summary>
-    /// <param name="fromId">The from <see cref="Person"/> identifier.</param>
-    /// <param name="toId">The to <see cref="Person"/> identifier.</param>
-    /// <returns>A resultant <see cref="Person"/>.</returns>
+    /// <param name="fromId">The from <c>Person</c> identifier.</param>
+    /// <param name="toId">The to <c>Person</c> identifier.</param>
+    /// <returns>A resultant <c>Person</c>.</returns>
     [HttpPost("api/v1/persons/merge", Name="Person_Merge")]
     [ProducesResponseType(typeof(Common.Entities.Person), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NoContent)]
@@ -179,7 +179,7 @@ public Task<IActionResult> Merge(Guid fromId, Guid toId)
         => _webApi.PostAsync<Person>(Request, p => _manager.MergeAsync(fromId, toId), alternateStatusCode: HttpStatusCode.NoContent, operationType: CoreEx.OperationType.Update);
 
     /// <summary>
-    /// Mark <see cref="Person"/>.
+    /// Mark <c>Person</c>.
     /// </summary>
     [HttpPost("api/v1/persons/mark", Name="Person_Mark")]
     [ProducesResponseType((int)HttpStatusCode.Accepted)]
@@ -187,10 +187,10 @@ public Task<IActionResult> Mark()
         => _webApi.PostAsync(Request, p => _manager.MarkAsync(), statusCode: HttpStatusCode.Accepted, operationType: CoreEx.OperationType.Update);
 
     /// <summary>
-    /// Get <see cref="Person"/> at specified <see cref="MapCoordinates"/>.
+    /// Get <c>Person</c> at specified <c>MapCoordinates</c>.
     /// </summary>
-    /// <param name="coordinates">The Coordinates (see <see cref="Business.Entities.MapCoordinates"/>).</param>
-    /// <returns>A resultant <see cref="MapCoordinates"/>.</returns>
+    /// <param name="coordinates">The Coordinates.</param>
+    /// <returns>A resultant <c>MapCoordinates</c>.</returns>
     [HttpPost("api/v1/persons/map", Name="Person_Map")]
     [ProducesResponseType(typeof(Common.Entities.MapCoordinates), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NoContent)]
@@ -203,7 +203,7 @@ public Task<IActionResult> Map(MapCoordinates? coordinates = default)
     /// <summary>
     /// Get no arguments.
     /// </summary>
-    /// <returns>The selected <see cref="Person"/> where found.</returns>
+    /// <returns>The selected <c>Person</c> where found.</returns>
     [HttpGet("api/v1/persons/noargsforme", Name="Person_GetNoArgs")]
     [ProducesResponseType(typeof(Common.Entities.Person), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NotFound)]
@@ -211,10 +211,10 @@ public Task<IActionResult> GetNoArgs()
         => _webApi.GetAsync<Person?>(Request, p => _manager.GetNoArgsAsync());
 
     /// <summary>
-    /// Gets the specified <see cref="PersonDetail"/>.
+    /// Gets the specified <c>PersonDetail</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Person"/> identifier.</param>
-    /// <returns>The selected <see cref="PersonDetail"/> where found.</returns>
+    /// <param name="id">The <c>Person</c> identifier.</param>
+    /// <returns>The selected <c>PersonDetail</c> where found.</returns>
     [HttpGet("api/v1/persons/{id}/detail", Name="Person_GetDetail")]
     [ProducesResponseType(typeof(Common.Entities.PersonDetail), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NotFound)]
@@ -222,10 +222,10 @@ public Task<IActionResult> GetDetail(Guid id)
         => _webApi.GetAsync<PersonDetail?>(Request, p => _manager.GetDetailAsync(id));
 
     /// <summary>
-    /// Updates an existing <see cref="PersonDetail"/>.
+    /// Updates an existing <c>PersonDetail</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Person"/> identifier.</param>
-    /// <returns>The updated <see cref="PersonDetail"/>.</returns>
+    /// <param name="id">The <c>Person</c> identifier.</param>
+    /// <returns>The updated <c>PersonDetail</c>.</returns>
     [HttpPut("api/v1/persons/{id}/detail", Name="Person_UpdateDetail")]
     [AcceptsBody(typeof(Common.Entities.PersonDetail))]
     [ProducesResponseType(typeof(Common.Entities.PersonDetail), (int)HttpStatusCode.OK)]
@@ -234,10 +234,10 @@ public Task<IActionResult> UpdateDetail(Guid id)
         => _webApi.PutAsync<PersonDetail, PersonDetail>(Request, p => _manager.UpdateDetailAsync(p.Value!, id));
 
     /// <summary>
-    /// Patches an existing <see cref="PersonDetail"/>.
+    /// Patches an existing <c>PersonDetail</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Person"/> identifier.</param>
-    /// <returns>The patched <see cref="PersonDetail"/>.</returns>
+    /// <param name="id">The <c>Person</c> identifier.</param>
+    /// <returns>The patched <c>PersonDetail</c>.</returns>
     [HttpPatch("api/v1/persons/{id}/detail", Name="Person_PatchDetail")]
     [AcceptsBody(typeof(Common.Entities.PersonDetail), HttpConsts.MergePatchMediaTypeName)]
     [ProducesResponseType(typeof(Common.Entities.PersonDetail), (int)HttpStatusCode.OK)]
@@ -248,7 +248,7 @@ public Task<IActionResult> PatchDetail(Guid id)
     /// <summary>
     /// Actually validating the FromBody parameter generation.
     /// </summary>
-    /// <param name="person">The Person (see <see cref="Entities.Person"/>).</param>
+    /// <param name="person">The Person.</param>
     [HttpPost("api/v1/persons/fromBody", Name="Person_Add")]
     [ProducesResponseType((int)HttpStatusCode.Created)]
     public Task<IActionResult> Add([FromBody] Person person)
@@ -267,7 +267,7 @@ public Task<IActionResult> CustomManagerOnly()
     /// </summary>
     /// <param name="name">The Name.</param>
     /// <param name="names">The Names.</param>
-    /// <returns>A resultant <see cref="Person"/>.</returns>
+    /// <returns>A resultant <c>Person</c>.</returns>
     [HttpGet("api/v1/persons/null", Name="Person_GetNull")]
     [ProducesResponseType(typeof(Common.Entities.Person), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NotFound)]
@@ -277,7 +277,7 @@ public Task<IActionResult> GetNull(string? name, List<string>? names = default)
     /// <summary>
     /// Validate when an Event is published but not sent.
     /// </summary>
-    /// <returns>The updated <see cref="Person"/>.</returns>
+    /// <returns>The updated <c>Person</c>.</returns>
     [HttpPut("api/v1/persons/publishnosend", Name="Person_EventPublishNoSend")]
     [AcceptsBody(typeof(Common.Entities.Person))]
     [ProducesResponseType(typeof(Common.Entities.Person), (int)HttpStatusCode.OK)]
@@ -286,13 +286,13 @@ public Task<IActionResult> EventPublishNoSend()
         => _webApi.PutAsync<Person, Person>(Request, p => _manager.EventPublishNoSendAsync(p.Value!));
 
     /// <summary>
-    /// Gets the <see cref="PersonCollectionResult"/> that contains the items that match the selection criteria.
+    /// Gets the <c>Person</c> array that contains the items that match the selection criteria.
     /// </summary>
     /// <param name="firstName">The First Name.</param>
     /// <param name="lastName">The Last Name.</param>
-    /// <param name="genders">The Genders (see <see cref="RefDataNamespace.Gender"/>).</param>
+    /// <param name="genders">The Genders.</param>
     /// <param name="orderBy">The Order By.</param>
-    /// <returns>The <see cref="PersonCollection"/></returns>
+    /// <returns>The <c>Person</c> array</returns>
     [HttpGet("api/v1/persons/args", Name="Person_GetByArgsWithEf")]
     [Paging]
     [ProducesResponseType(typeof(Common.Entities.PersonCollection), (int)HttpStatusCode.OK)]
@@ -314,8 +314,8 @@ public Task<IActionResult> ThrowError()
     /// <summary>
     /// Invoke Api Via Agent.
     /// </summary>
-    /// <param name="id">The <see cref="Person"/> identifier.</param>
-    /// <returns>A resultant <see cref="string"/>.</returns>
+    /// <param name="id">The <c>Person</c> identifier.</param>
+    /// <returns>A resultant <c>string</c>.</returns>
     [HttpPost("api/v1/persons/invokeApi", Name="Person_InvokeApiViaAgent")]
     [ProducesResponseType(typeof(string), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NotFound)]
@@ -332,10 +332,10 @@ public Task<IActionResult> ParamColl([FromBody] AddressCollection? addresses)
         => _webApi.PostAsync(Request, p => _manager.ParamCollAsync(addresses), statusCode: HttpStatusCode.NoContent, operationType: CoreEx.OperationType.Unspecified);
 
     /// <summary>
-    /// Gets the specified <see cref="Person"/>.
+    /// Gets the specified <c>Person</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Person"/> identifier.</param>
-    /// <returns>The selected <see cref="Person"/> where found.</returns>
+    /// <param name="id">The <c>Person</c> identifier.</param>
+    /// <returns>The selected <c>Person</c> where found.</returns>
     [HttpGet("api/v1/persons/ef/{id}", Name="Person_GetWithEf")]
     [ProducesResponseType(typeof(Common.Entities.Person), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NotFound)]
@@ -343,9 +343,9 @@ public Task<IActionResult> GetWithEf(Guid id)
         => _webApi.GetAsync<Person?>(Request, p => _manager.GetWithEfAsync(id));
 
     /// <summary>
-    /// Creates a new <see cref="Person"/>.
+    /// Creates a new <c>Person</c>.
     /// </summary>
-    /// <returns>The created <see cref="Person"/>.</returns>
+    /// <returns>The created <c>Person</c>.</returns>
     [HttpPost("api/v1/persons/ef", Name="Person_CreateWithEf")]
     [AcceptsBody(typeof(Common.Entities.Person))]
     [ProducesResponseType(typeof(Common.Entities.Person), (int)HttpStatusCode.Created)]
@@ -353,10 +353,10 @@ public Task<IActionResult> CreateWithEf()
         => _webApi.PostAsync<Person, Person>(Request, p => _manager.CreateWithEfAsync(p.Value!), statusCode: HttpStatusCode.Created, locationUri: r => new Uri($"/api/v1/persons/ef/{r.Id}", UriKind.Relative));
 
     /// <summary>
-    /// Updates an existing <see cref="Person"/>.
+    /// Updates an existing <c>Person</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Person"/> identifier.</param>
-    /// <returns>The updated <see cref="Person"/>.</returns>
+    /// <param name="id">The <c>Person</c> identifier.</param>
+    /// <returns>The updated <c>Person</c>.</returns>
     [HttpPut("api/v1/persons/ef/{id}", Name="Person_UpdateWithEf")]
     [AcceptsBody(typeof(Common.Entities.Person))]
     [ProducesResponseType(typeof(Common.Entities.Person), (int)HttpStatusCode.OK)]
@@ -365,19 +365,19 @@ public Task<IActionResult> UpdateWithEf(Guid id)
         => _webApi.PutAsync<Person, Person>(Request, p => _manager.UpdateWithEfAsync(p.Value!, id));
 
     /// <summary>
-    /// Deletes the specified <see cref="Person"/>.
+    /// Deletes the specified <c>Person</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Person"/> identifier.</param>
+    /// <param name="id">The <c>Person</c> identifier.</param>
     [HttpDelete("api/v1/persons/ef/{id}", Name="Person_DeleteWithEf")]
     [ProducesResponseType((int)HttpStatusCode.NoContent)]
     public Task<IActionResult> DeleteWithEf(Guid id)
         => _webApi.DeleteAsync(Request, p => _manager.DeleteWithEfAsync(id));
 
     /// <summary>
-    /// Patches an existing <see cref="Person"/>.
+    /// Patches an existing <c>Person</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Person"/> identifier.</param>
-    /// <returns>The patched <see cref="Person"/>.</returns>
+    /// <param name="id">The <c>Person</c> identifier.</param>
+    /// <returns>The patched <c>Person</c>.</returns>
     [HttpPatch("api/v1/persons/ef/{id}", Name="Person_PatchWithEf")]
     [AcceptsBody(typeof(Common.Entities.Person), HttpConsts.MergePatchMediaTypeName)]
     [ProducesResponseType(typeof(Common.Entities.Person), (int)HttpStatusCode.OK)]
@@ -388,8 +388,8 @@ public Task<IActionResult> PatchWithEf(Guid id)
     /// <summary>
     /// Get Documentation.
     /// </summary>
-    /// <param name="id">The <see cref="Person"/> identifier.</param>
-    /// <returns>A resultant <see cref="FileContentResult"/>.</returns>
+    /// <param name="id">The <c>Person</c> identifier.</param>
+    /// <returns>A resultant <c>FileContentResult</c>.</returns>
     [HttpGet("api/v1/persons/{id}/documentation", Name="Person_GetDocumentation")]
     [Produces("text/plain")]
     [ProducesResponseType((int)HttpStatusCode.OK)]
@@ -400,8 +400,8 @@ public Task<IActionResult> GetDocumentation(Guid id)
     /// <summary>
     /// Simulate Work.
     /// </summary>
-    /// <param name="id">The <see cref="Person"/> identifier.</param>
-    /// <returns>A resultant <see cref="string"/>.</returns>
+    /// <param name="id">The <c>Person</c> identifier.</param>
+    /// <returns>A resultant <c>string</c>.</returns>
     [HttpGet("api/v1/persons/simulate", Name="Person_SimulateWork")]
     [ProducesResponseType(typeof(string), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NoContent)]
diff --git a/samples/Demo/Beef.Demo.Api/Controllers/Generated/PostalInfoController.cs b/samples/Demo/Beef.Demo.Api/Controllers/Generated/PostalInfoController.cs
index 734dd3aa2..027708d2a 100644
--- a/samples/Demo/Beef.Demo.Api/Controllers/Generated/PostalInfoController.cs
+++ b/samples/Demo/Beef.Demo.Api/Controllers/Generated/PostalInfoController.cs
@@ -28,12 +28,12 @@ public PostalInfoController(WebApi webApi, IPostalInfoManager manager)
     partial void PostalInfoControllerCtor(); // Enables additional functionality to be added to the constructor.
 
     /// <summary>
-    /// Gets the specified <see cref="PostalInfo"/>.
+    /// Gets the specified <c>PostalInfo</c>.
     /// </summary>
-    /// <param name="country">The Country (see <see cref="RefDataNamespace.Country"/>).</param>
+    /// <param name="country">The Country.</param>
     /// <param name="state">The State.</param>
     /// <param name="city">The City.</param>
-    /// <returns>The selected <see cref="PostalInfo"/> where found.</returns>
+    /// <returns>The selected <c>PostalInfo</c> where found.</returns>
     [HttpGet("api/v1/postal/{country}/{state}/{city}", Name="PostalInfo_GetPostCodes")]
     [ProducesResponseType(typeof(Common.Entities.PostalInfo), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NotFound)]
@@ -41,12 +41,12 @@ public Task<IActionResult> GetPostCodes(string? country, string? state, string?
         => _webApi.GetWithResultAsync<PostalInfo?>(Request, p => _manager.GetPostCodesAsync(country, state, city));
 
     /// <summary>
-    /// Creates a new <see cref="PostalInfo"/>.
+    /// Creates a new <c>PostalInfo</c>.
     /// </summary>
-    /// <param name="country">The Country (see <see cref="RefDataNamespace.Country"/>).</param>
+    /// <param name="country">The Country.</param>
     /// <param name="state">The State.</param>
     /// <param name="city">The City.</param>
-    /// <returns>The created <see cref="PostalInfo"/>.</returns>
+    /// <returns>The created <c>PostalInfo</c>.</returns>
     [HttpPost("api/v1/postal/{country}/{state}/{city}", Name="PostalInfo_CreatePostCodes")]
     [AcceptsBody(typeof(Common.Entities.PostalInfo))]
     [ProducesResponseType(typeof(Common.Entities.PostalInfo), (int)HttpStatusCode.Created)]
@@ -54,12 +54,12 @@ public Task<IActionResult> CreatePostCodes(string? country, string? state, strin
         => _webApi.PostWithResultAsync<PostalInfo, PostalInfo>(Request, p => _manager.CreatePostCodesAsync(p.Value!, country, state, city), statusCode: HttpStatusCode.Created);
 
     /// <summary>
-    /// Updates an existing <see cref="PostalInfo"/>.
+    /// Updates an existing <c>PostalInfo</c>.
     /// </summary>
-    /// <param name="country">The Country (see <see cref="RefDataNamespace.Country"/>).</param>
+    /// <param name="country">The Country.</param>
     /// <param name="state">The State.</param>
     /// <param name="city">The City.</param>
-    /// <returns>The updated <see cref="PostalInfo"/>.</returns>
+    /// <returns>The updated <c>PostalInfo</c>.</returns>
     [HttpPut("api/v1/postal/{country}/{state}/{city}", Name="PostalInfo_UpdatePostCodes")]
     [AcceptsBody(typeof(Common.Entities.PostalInfo))]
     [ProducesResponseType(typeof(Common.Entities.PostalInfo), (int)HttpStatusCode.OK)]
@@ -68,12 +68,12 @@ public Task<IActionResult> UpdatePostCodes(string? country, string? state, strin
         => _webApi.PutWithResultAsync<PostalInfo>(Request, get: _ => _manager.GetPostCodesAsync(country, state, city), put: p => _manager.UpdatePostCodesAsync(p.Value!, country, state, city), simulatedConcurrency: true);
 
     /// <summary>
-    /// Patches an existing <see cref="PostalInfo"/>.
+    /// Patches an existing <c>PostalInfo</c>.
     /// </summary>
-    /// <param name="country">The Country (see <see cref="RefDataNamespace.Country"/>).</param>
+    /// <param name="country">The Country.</param>
     /// <param name="state">The State.</param>
     /// <param name="city">The City.</param>
-    /// <returns>The patched <see cref="PostalInfo"/>.</returns>
+    /// <returns>The patched <c>PostalInfo</c>.</returns>
     [HttpPatch("api/v1/postal/{country}/{state}/{city}", Name="PostalInfo_PatchPostCodes")]
     [AcceptsBody(typeof(Common.Entities.PostalInfo), HttpConsts.MergePatchMediaTypeName)]
     [ProducesResponseType(typeof(Common.Entities.PostalInfo), (int)HttpStatusCode.OK)]
@@ -82,9 +82,9 @@ public Task<IActionResult> PatchPostCodes(string? country, string? state, string
         => _webApi.PatchWithResultAsync<PostalInfo>(Request, get: _ => _manager.GetPostCodesAsync(country, state, city), put: p => _manager.UpdatePostCodesAsync(p.Value!, country, state, city), simulatedConcurrency: true);
 
     /// <summary>
-    /// Deletes the specified <see cref="PostalInfo"/>.
+    /// Deletes the specified <c>PostalInfo</c>.
     /// </summary>
-    /// <param name="country">The Country (see <see cref="RefDataNamespace.Country"/>).</param>
+    /// <param name="country">The Country.</param>
     /// <param name="state">The State.</param>
     /// <param name="city">The City.</param>
     [HttpDelete("api/v1/postal/{country}/{state}/{city}", Name="PostalInfo_DeletePostCodes")]
diff --git a/samples/Demo/Beef.Demo.Api/Controllers/Generated/ReferenceDataController.cs b/samples/Demo/Beef.Demo.Api/Controllers/Generated/ReferenceDataController.cs
index 34acc08df..e558d3f17 100644
--- a/samples/Demo/Beef.Demo.Api/Controllers/Generated/ReferenceDataController.cs
+++ b/samples/Demo/Beef.Demo.Api/Controllers/Generated/ReferenceDataController.cs
@@ -29,11 +29,11 @@ public ReferenceDataController(ReferenceDataContentWebApi webApi, ReferenceDataO
         { _webApi = webApi.ThrowIfNull(); _orchestrator = orchestrator.ThrowIfNull(); }
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.Country"/> reference data items that match the specified criteria.
+    /// Gets all of the 'Country' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.Country collection.</returns>
+    /// <returns>The 'Country' array.</returns>
     [AllowAnonymous]
     [HttpGet("api/v1/demo/ref/countries", Name="ReferenceData_CountryGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.Country>), (int)HttpStatusCode.OK)]
@@ -41,11 +41,11 @@ public Task<IActionResult> CountryGetAll([FromQuery] IEnumerable<string>? codes
         => _webApi.GetAsync(Request, p => _orchestrator.GetWithFilterAsync<RefDataNamespace.Country>(codes, text, p.RequestOptions.IncludeInactive));
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.USState"/> reference data items that match the specified criteria.
+    /// Gets all of the 'USState' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.USState collection.</returns>
+    /// <returns>The 'USState' array.</returns>
     [AllowAnonymous]
     [HttpGet("api/v1/demo/ref/usStates", Name="ReferenceData_USStateGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.USState>), (int)HttpStatusCode.OK)]
@@ -53,11 +53,11 @@ public Task<IActionResult> USStateGetAll([FromQuery] IEnumerable<string>? codes
         => _webApi.GetAsync(Request, p => _orchestrator.GetWithFilterAsync<RefDataNamespace.USState>(codes, text, p.RequestOptions.IncludeInactive));
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.Gender"/> reference data items that match the specified criteria.
+    /// Gets all of the 'Gender' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.Gender collection.</returns>
+    /// <returns>The 'Gender' array.</returns>
     [AllowAnonymous]
     [HttpGet("api/v1/demo/ref/genders", Name="ReferenceData_GenderGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.Gender>), (int)HttpStatusCode.OK)]
@@ -65,11 +65,11 @@ public Task<IActionResult> GenderGetAll([FromQuery] IEnumerable<string>? codes =
         => _webApi.GetAsync(Request, p => _orchestrator.GetWithFilterAsync<RefDataNamespace.Gender>(codes, text, p.RequestOptions.IncludeInactive));
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.EyeColor"/> reference data items that match the specified criteria.
+    /// Gets all of the 'EyeColor' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.EyeColor collection.</returns>
+    /// <returns>The 'EyeColor' array.</returns>
     [AllowAnonymous]
     [HttpGet("api/v1/demo/ref/eyeColors", Name="ReferenceData_EyeColorGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.EyeColor>), (int)HttpStatusCode.OK)]
@@ -77,11 +77,11 @@ public Task<IActionResult> EyeColorGetAll([FromQuery] IEnumerable<string>? codes
         => _webApi.GetAsync(Request, p => _orchestrator.GetWithFilterAsync<RefDataNamespace.EyeColor>(codes, text, p.RequestOptions.IncludeInactive));
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.PowerSource"/> reference data items that match the specified criteria.
+    /// Gets all of the 'PowerSource' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.PowerSource collection.</returns>
+    /// <returns>The 'PowerSource' array.</returns>
     [AllowAnonymous]
     [HttpGet("api/v1/demo/ref/powerSources", Name="ReferenceData_PowerSourceGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.PowerSource>), (int)HttpStatusCode.OK)]
@@ -89,11 +89,11 @@ public Task<IActionResult> PowerSourceGetAll([FromQuery] IEnumerable<string>? co
         => _webApi.GetAsync(Request, p => _orchestrator.GetWithFilterAsync<RefDataNamespace.PowerSource>(codes, text, p.RequestOptions.IncludeInactive));
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.Company"/> reference data items that match the specified criteria.
+    /// Gets all of the 'Company' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.Company collection.</returns>
+    /// <returns>The 'Company' array.</returns>
     [AllowAnonymous]
     [HttpGet("api/v1/demo/ref/companies", Name="ReferenceData_CompanyGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.Company>), (int)HttpStatusCode.OK)]
@@ -101,11 +101,11 @@ public Task<IActionResult> CompanyGetAll([FromQuery] IEnumerable<string>? codes
         => _webApi.GetAsync(Request, p => _orchestrator.GetWithFilterAsync<RefDataNamespace.Company>(codes, text, p.RequestOptions.IncludeInactive));
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.Status"/> reference data items that match the specified criteria.
+    /// Gets all of the 'Status' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.Status collection.</returns>
+    /// <returns>The 'Status' array.</returns>
     [AllowAnonymous]
     [HttpGet("api/v1/demo/ref/statuses", Name="ReferenceData_StatusGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.Status>), (int)HttpStatusCode.OK)]
@@ -113,11 +113,11 @@ public Task<IActionResult> StatusGetAll([FromQuery] IEnumerable<string>? codes =
         => _webApi.GetAsync(Request, p => _orchestrator.GetWithFilterAsync<RefDataNamespace.Status>(codes, text, p.RequestOptions.IncludeInactive));
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.CommunicationType"/> reference data items that match the specified criteria.
+    /// Gets all of the 'CommunicationType' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.CommunicationType collection.</returns>
+    /// <returns>The 'CommunicationType' array.</returns>
     [AllowAnonymous]
     [HttpGet("api/v1/demo/ref/communicationTypes", Name="ReferenceData_CommunicationTypeGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.CommunicationType>), (int)HttpStatusCode.OK)]
@@ -127,7 +127,7 @@ public Task<IActionResult> CommunicationTypeGetAll([FromQuery] IEnumerable<strin
     /// <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>
-    /// <returns>A <see cref="ReferenceDataMultiDictionary"/>.</returns>
+    /// <returns>The 'ReferenceDataMultiDictionary'.</returns>
     [AllowAnonymous]
     [HttpGet("api/v1/demo/ref", Name="ReferenceData_GetNamed")]
     [ProducesResponseType(typeof(CoreEx.RefData.ReferenceDataMultiDictionary), (int)HttpStatusCode.OK)]
diff --git a/samples/Demo/Beef.Demo.Api/Controllers/Generated/RobotController.cs b/samples/Demo/Beef.Demo.Api/Controllers/Generated/RobotController.cs
index ed7bb0811..7a22b8fdf 100644
--- a/samples/Demo/Beef.Demo.Api/Controllers/Generated/RobotController.cs
+++ b/samples/Demo/Beef.Demo.Api/Controllers/Generated/RobotController.cs
@@ -30,8 +30,8 @@ public RobotController(WebApi webApi, IRobotManager manager)
     /// <summary>
     /// Get the R-O-B-O-T.
     /// </summary>
-    /// <param name="id">The <see cref="Robot"/> identifier.</param>
-    /// <returns>The selected <see cref="Robot"/> where found.</returns>
+    /// <param name="id">The <c>Robot</c> identifier.</param>
+    /// <returns>The selected <c>Robot</c> where found.</returns>
     [HttpGet("api/v1/robots/{id}", Name="Robot_Get")]
     [ProducesResponseType(typeof(Common.Entities.Robot), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NotFound)]
@@ -39,9 +39,9 @@ public Task<IActionResult> Get(Guid id)
         => _webApi.GetWithResultAsync<Robot?>(Request, p => _manager.GetAsync(id));
 
     /// <summary>
-    /// Creates a new <see cref="Robot"/>.
+    /// Creates a new <c>Robot</c>.
     /// </summary>
-    /// <returns>The created <see cref="Robot"/>.</returns>
+    /// <returns>The created <c>Robot</c>.</returns>
     [HttpPost("api/v1/robots", Name="Robot_Create")]
     [AcceptsBody(typeof(Common.Entities.Robot))]
     [ProducesResponseType(typeof(Common.Entities.Robot), (int)HttpStatusCode.Created)]
@@ -49,10 +49,10 @@ public Task<IActionResult> Create()
         => _webApi.PostWithResultAsync<Robot, Robot>(Request, p => _manager.CreateAsync(p.Value!), statusCode: HttpStatusCode.Created, locationUri: r => new Uri($"/api/v1/robots/{r.Id}", UriKind.Relative));
 
     /// <summary>
-    /// Updates an existing <see cref="Robot"/>.
+    /// Updates an existing <c>Robot</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Robot"/> identifier.</param>
-    /// <returns>The updated <see cref="Robot"/>.</returns>
+    /// <param name="id">The <c>Robot</c> identifier.</param>
+    /// <returns>The updated <c>Robot</c>.</returns>
     [HttpPut("api/v1/robots/{id}", Name="Robot_Update")]
     [AcceptsBody(typeof(Common.Entities.Robot))]
     [ProducesResponseType(typeof(Common.Entities.Robot), (int)HttpStatusCode.OK)]
@@ -61,10 +61,10 @@ public Task<IActionResult> Update(Guid id)
         => _webApi.PutWithResultAsync<Robot, Robot>(Request, p => _manager.UpdateAsync(p.Value!, id));
 
     /// <summary>
-    /// Patches an existing <see cref="Robot"/>.
+    /// Patches an existing <c>Robot</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Robot"/> identifier.</param>
-    /// <returns>The patched <see cref="Robot"/>.</returns>
+    /// <param name="id">The <c>Robot</c> identifier.</param>
+    /// <returns>The patched <c>Robot</c>.</returns>
     [HttpPatch("api/v1/robots/{id}", Name="Robot_Patch")]
     [AcceptsBody(typeof(Common.Entities.Robot), HttpConsts.MergePatchMediaTypeName)]
     [ProducesResponseType(typeof(Common.Entities.Robot), (int)HttpStatusCode.OK)]
@@ -73,21 +73,21 @@ public Task<IActionResult> Patch(Guid id)
         => _webApi.PatchWithResultAsync<Robot>(Request, get: _ => _manager.GetAsync(id), put: p => _manager.UpdateAsync(p.Value!, id));
 
     /// <summary>
-    /// Deletes the specified <see cref="Robot"/>.
+    /// Deletes the specified <c>Robot</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Robot"/> identifier.</param>
+    /// <param name="id">The <c>Robot</c> identifier.</param>
     [HttpDelete("api/v1/robots/{id}", Name="Robot_Delete")]
     [ProducesResponseType((int)HttpStatusCode.NoContent)]
     public Task<IActionResult> Delete(Guid id)
         => _webApi.DeleteWithResultAsync(Request, p => _manager.DeleteAsync(id));
 
     /// <summary>
-    /// Gets the <see cref="RobotCollectionResult"/> that contains the items that match the selection criteria.
+    /// Gets the <c>Robot</c> array that contains the items that match the selection criteria.
     /// </summary>
     /// <param name="modelNo">The Model number.</param>
     /// <param name="serialNo">The Unique serial number.</param>
-    /// <param name="powerSources">The Power Sources (see <see cref="RefDataNamespace.PowerSource"/>).</param>
-    /// <returns>The <see cref="RobotCollection"/></returns>
+    /// <param name="powerSources">The Power Sources.</param>
+    /// <returns>The <c>Robot</c> array</returns>
     [HttpGet("api/v1/robots", Name="Robot_GetByArgs")]
     [Paging]
     [ProducesResponseType(typeof(Common.Entities.RobotCollection), (int)HttpStatusCode.OK)]
@@ -99,10 +99,10 @@ public Task<IActionResult> GetByArgs([FromQuery(Name="model-no")] string? modelN
     }
 
     /// <summary>
-    /// Raises a <see cref="Robot.PowerSource"/> change event.
+    /// Raises a <c>Robot.PowerSource</c> change event.
     /// </summary>
-    /// <param name="id">The <see cref="Robot"/> identifier.</param>
-    /// <param name="powerSource">The Power Source (see <see cref="RefDataNamespace.PowerSource"/>).</param>
+    /// <param name="id">The <c>Robot</c> identifier.</param>
+    /// <param name="powerSource">The Power Source.</param>
     [HttpPost("api/v1/robots/{id}/powerSource/{powerSource}", Name="Robot_RaisePowerSourceChange")]
     [ProducesResponseType((int)HttpStatusCode.Accepted)]
     public Task<IActionResult> RaisePowerSourceChange(Guid id, string? powerSource)
diff --git a/samples/Demo/Beef.Demo.Business/Beef.Demo.Business.csproj b/samples/Demo/Beef.Demo.Business/Beef.Demo.Business.csproj
index a55a6c56e..16cac5168 100644
--- a/samples/Demo/Beef.Demo.Business/Beef.Demo.Business.csproj
+++ b/samples/Demo/Beef.Demo.Business/Beef.Demo.Business.csproj
@@ -16,14 +16,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.21.0" />
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.21.0" />
-    <PackageReference Include="CoreEx.Cosmos" Version="3.21.0" />
-    <PackageReference Include="CoreEx.Database" Version="3.21.0" />
-    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.21.0" />
-    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.21.0" />
-    <PackageReference Include="CoreEx.Validation" Version="3.21.0" />
-    <PackageReference Include="CoreEx.FluentValidation" Version="3.21.0" />
+    <PackageReference Include="CoreEx" Version="3.21.1" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.21.1" />
+    <PackageReference Include="CoreEx.Cosmos" Version="3.21.1" />
+    <PackageReference Include="CoreEx.Database" Version="3.21.1" />
+    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.21.1" />
+    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.21.1" />
+    <PackageReference Include="CoreEx.Validation" Version="3.21.1" />
+    <PackageReference Include="CoreEx.FluentValidation" Version="3.21.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.20" />
   </ItemGroup>
 
diff --git a/samples/Demo/Beef.Demo.Business/Generated/ReferenceDataProvider.cs b/samples/Demo/Beef.Demo.Business/Generated/ReferenceDataProvider.cs
index 974af75a0..28f4bbe41 100644
--- a/samples/Demo/Beef.Demo.Business/Generated/ReferenceDataProvider.cs
+++ b/samples/Demo/Beef.Demo.Business/Generated/ReferenceDataProvider.cs
@@ -23,8 +23,8 @@ public partial class ReferenceDataProvider : IReferenceDataProvider
     partial void ReferenceDataProviderCtor(); // Enables the ReferenceDataProvider constructor to be extended.
 
     /// <inheritdoc/>
-    public Type[] Types => new Type[] 
-    {
+    public Type[] Types =>
+    [
         typeof(RefDataNamespace.Country),
         typeof(RefDataNamespace.USState),
         typeof(RefDataNamespace.Gender),
@@ -33,7 +33,7 @@ public partial class ReferenceDataProvider : IReferenceDataProvider
         typeof(RefDataNamespace.Company),
         typeof(RefDataNamespace.Status),
         typeof(RefDataNamespace.CommunicationType)
-    };
+    ];
 
     /// <inheritdoc/>
     public Task<Result<IReferenceDataCollection>> GetAsync(Type type, CancellationToken cancellationToken = default) => _dataService.GetAsync(type);
diff --git a/samples/Demo/Beef.Demo.CodeGen/Properties/launchSettings.json b/samples/Demo/Beef.Demo.CodeGen/Properties/launchSettings.json
index eff4d367c..78e8c74ec 100644
--- a/samples/Demo/Beef.Demo.CodeGen/Properties/launchSettings.json
+++ b/samples/Demo/Beef.Demo.CodeGen/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Beef.Demo.CodeGen": {
       "commandName": "Project",
-      "commandLineArgs": "entity"
+      "commandLineArgs": "openapi \"https://raw.githubusercontent.com/bian-official/public/main/release12.0.0/semantic-apis/oas3/yamls/CurrentAccount.yaml\" --param \"include=/CurrentAccount/{currentaccountid}/Retrieve,/CurrentAccount/{currentaccountid}/Update\""
     }
   }
 }
\ No newline at end of file
diff --git a/samples/Demo/Beef.Demo.Common/Beef.Demo.Common.csproj b/samples/Demo/Beef.Demo.Common/Beef.Demo.Common.csproj
index 15989ed5a..543c63af7 100644
--- a/samples/Demo/Beef.Demo.Common/Beef.Demo.Common.csproj
+++ b/samples/Demo/Beef.Demo.Common/Beef.Demo.Common.csproj
@@ -7,7 +7,7 @@
     <Folder Include="Agents\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.21.0" />
+    <PackageReference Include="CoreEx" Version="3.21.1" />
     <PackageReference Include="Grpc.Tools" Version="2.64.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/Address.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/Address.cs
index fc64e1f61..6308043eb 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/Address.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/Address.cs
@@ -30,7 +30,7 @@ public partial class Address
     }
 
     /// <summary>
-    /// Represents the <see cref="Address"/> collection.
+    /// Represents the <c>Address</c> collection.
     /// </summary>
     public partial class AddressCollection : List<Address> { }
 }
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/CommunicationType.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/CommunicationType.cs
index 8fd58a2be..8ae43d87b 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/CommunicationType.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/CommunicationType.cs
@@ -20,7 +20,7 @@ namespace Beef.Demo.Common.Entities
     public partial class CommunicationType : ReferenceDataBase<int> { }
 
     /// <summary>
-    /// Represents the <see cref="CommunicationType"/> collection.
+    /// Represents the <c>CommunicationType</c> collection.
     /// </summary>
     public partial class CommunicationTypeCollection : List<CommunicationType> { }
 }
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/Company.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/Company.cs
index 8e0155a2a..53f22735a 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/Company.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/Company.cs
@@ -26,7 +26,7 @@ public partial class Company : ReferenceDataBase<Guid>
     }
 
     /// <summary>
-    /// Represents the <see cref="Company"/> collection.
+    /// Represents the <c>Company</c> collection.
     /// </summary>
     public partial class CompanyCollection : List<Company> { }
 }
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/Contact.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/Contact.cs
index ad3d684df..a411a5a0a 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/Contact.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/Contact.cs
@@ -19,7 +19,7 @@ namespace Beef.Demo.Common.Entities
     public partial class Contact : IIdentifier<Guid>
     {
         /// <summary>
-        /// Gets or sets the <see cref="Contact"/> identifier.
+        /// Gets or sets the <c>Contact</c> identifier.
         /// </summary>
         public Guid Id { get; set; }
 
@@ -34,7 +34,7 @@ public partial class Contact : IIdentifier<Guid>
         public string? LastName { get; set; }
 
         /// <summary>
-        /// Gets the corresponding <see cref="Status"/> text (read-only where selected).
+        /// Gets the corresponding <c>Status</c> text (read-only where selected).
         /// </summary>
         public string? StatusDescription { get; set; }
 
@@ -50,12 +50,12 @@ public partial class Contact : IIdentifier<Guid>
     }
 
     /// <summary>
-    /// Represents the <see cref="Contact"/> collection.
+    /// Represents the <c>Contact</c> collection.
     /// </summary>
     public partial class ContactCollection : List<Contact> { }
 
     /// <summary>
-    /// Represents the <see cref="Contact"/> collection result.
+    /// Represents the <c>Contact</c> collection result.
     /// </summary>
     public class ContactCollectionResult : CollectionResult<ContactCollection, Contact>
     {
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/ContactComm.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/ContactComm.cs
index 80f5a24fe..4da9295c3 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/ContactComm.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/ContactComm.cs
@@ -14,7 +14,7 @@
 namespace Beef.Demo.Common.Entities
 {
     /// <summary>
-    /// Represents the <see cref="Contact"/> Comm entity.
+    /// Represents the <c>Contact</c> Comm entity.
     /// </summary>
     public partial class ContactComm
     {
@@ -30,7 +30,7 @@ public partial class ContactComm
     }
 
     /// <summary>
-    /// Represents the <see cref="ContactComm"/> collection.
+    /// Represents the <c>ContactComm</c> collection.
     /// </summary>
     public partial class ContactCommCollection : Dictionary<string, ContactComm> { }
 }
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/Country.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/Country.cs
index 10b1c9bb5..3a7e74b5b 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/Country.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/Country.cs
@@ -20,7 +20,7 @@ namespace Beef.Demo.Common.Entities
     public partial class Country : ReferenceDataBase<Guid> { }
 
     /// <summary>
-    /// Represents the <see cref="Country"/> collection.
+    /// Represents the <c>Country</c> collection.
     /// </summary>
     public partial class CountryCollection : List<Country> { }
 }
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/EyeColor.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/EyeColor.cs
index 5414dc6fd..f737391a5 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/EyeColor.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/EyeColor.cs
@@ -20,7 +20,7 @@ namespace Beef.Demo.Common.Entities
     public partial class EyeColor : ReferenceDataBase<Guid> { }
 
     /// <summary>
-    /// Represents the <see cref="EyeColor"/> collection.
+    /// Represents the <c>EyeColor</c> collection.
     /// </summary>
     public partial class EyeColorCollection : List<EyeColor> { }
 }
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/Gender.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/Gender.cs
index e9a73e09e..23502b658 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/Gender.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/Gender.cs
@@ -37,7 +37,7 @@ public partial class Gender : ReferenceDataBase<Guid>
     }
 
     /// <summary>
-    /// Represents the <see cref="Gender"/> collection.
+    /// Represents the <c>Gender</c> collection.
     /// </summary>
     public partial class GenderCollection : List<Gender> { }
 }
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/Person.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/Person.cs
index a8864635f..85a48bcf2 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/Person.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/Person.cs
@@ -19,7 +19,7 @@ namespace Beef.Demo.Common.Entities
     public partial class Person : IIdentifier<Guid>, IETag, IChangeLog
     {
         /// <summary>
-        /// Gets or sets the <see cref="Person"/> identifier.
+        /// Gets or sets the <c>Person</c> identifier.
         /// </summary>
         [System.Xml.Serialization.XmlElement("Id")]
         public Guid Id { get; set; }
@@ -40,7 +40,7 @@ public partial class Person : IIdentifier<Guid>, IETag, IChangeLog
         public string? UniqueCode { get; set; }
 
         /// <summary>
-        /// Gets the corresponding <see cref="Gender"/> text (read-only where selected).
+        /// Gets the corresponding <c>Gender</c> text (read-only where selected).
         /// </summary>
         public string? GenderText { get; set; }
 
@@ -50,7 +50,7 @@ public partial class Person : IIdentifier<Guid>, IETag, IChangeLog
         public string? Gender { get; set; }
 
         /// <summary>
-        /// Gets the corresponding <see cref="EyeColor"/> text (read-only where selected).
+        /// Gets the corresponding <c>EyeColor</c> text (read-only where selected).
         /// </summary>
         public string? EyeColorText { get; set; }
 
@@ -87,12 +87,12 @@ public partial class Person : IIdentifier<Guid>, IETag, IChangeLog
     }
 
     /// <summary>
-    /// Represents the <see cref="Person"/> collection.
+    /// Represents the <c>Person</c> collection.
     /// </summary>
     public partial class PersonCollection : List<Person> { }
 
     /// <summary>
-    /// Represents the <see cref="Person"/> collection result.
+    /// Represents the <c>Person</c> collection result.
     /// </summary>
     public class PersonCollectionResult : CollectionResult<PersonCollection, Person>
     {
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonArgs.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonArgs.cs
index c442bba50..c68287e84 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonArgs.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonArgs.cs
@@ -14,7 +14,7 @@
 namespace Beef.Demo.Common.Entities
 {
     /// <summary>
-    /// Represents the <see cref="Person"/> arguments entity.
+    /// Represents the <c>Person</c> arguments entity.
     /// </summary>
     public partial class PersonArgs
     {
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonDetail.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonDetail.cs
index 530dd14ab..b369ce766 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonDetail.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonDetail.cs
@@ -14,7 +14,7 @@
 namespace Beef.Demo.Common.Entities
 {
     /// <summary>
-    /// Represents the <see cref="Person"/> detail entity.
+    /// Represents the <c>Person</c> detail entity.
     /// </summary>
     public partial class PersonDetail : Person
     {
@@ -25,12 +25,12 @@ public partial class PersonDetail : Person
     }
 
     /// <summary>
-    /// Represents the <see cref="PersonDetail"/> collection.
+    /// Represents the <c>PersonDetail</c> collection.
     /// </summary>
     public partial class PersonDetailCollection : List<PersonDetail> { }
 
     /// <summary>
-    /// Represents the <see cref="PersonDetail"/> collection result.
+    /// Represents the <c>PersonDetail</c> collection result.
     /// </summary>
     public class PersonDetailCollectionResult : CollectionResult<PersonDetailCollection, PersonDetail>
     {
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonOther.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonOther.cs
index da7c119fa..d1923055e 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonOther.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/PersonOther.cs
@@ -14,12 +14,12 @@
 namespace Beef.Demo.Common.Entities
 {
     /// <summary>
-    /// Represents the other <see cref="Person"/> without <see cref="EntityBase"/> capabilities entity.
+    /// Represents the other <c>Person</c> without <c>EntityBase</c> capabilities entity.
     /// </summary>
     public partial class PersonOther : IIdentifier<Guid>, IETag, IChangeLog
     {
         /// <summary>
-        /// Gets or sets the <see cref="Person"/> identifier.
+        /// Gets or sets the <c>Person</c> identifier.
         /// </summary>
         public Guid Id { get; set; }
 
@@ -46,7 +46,7 @@ public partial class PersonOther : IIdentifier<Guid>, IETag, IChangeLog
     }
 
     /// <summary>
-    /// Represents the <see cref="PersonOther"/> collection.
+    /// Represents the <c>PersonOther</c> collection.
     /// </summary>
     public partial class PersonOtherCollection : List<PersonOther> { }
 }
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/PlaceInfo.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/PlaceInfo.cs
index 9ac311439..f2406e39d 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/PlaceInfo.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/PlaceInfo.cs
@@ -30,7 +30,7 @@ public partial class PlaceInfo
     }
 
     /// <summary>
-    /// Represents the <see cref="PlaceInfo"/> collection.
+    /// Represents the <c>PlaceInfo</c> collection.
     /// </summary>
     public partial class PlaceInfoCollection : List<PlaceInfo> { }
 }
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/PostalInfo.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/PostalInfo.cs
index 23fe9df04..97db3849e 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/PostalInfo.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/PostalInfo.cs
@@ -19,7 +19,7 @@ namespace Beef.Demo.Common.Entities
     public partial class PostalInfo
     {
         /// <summary>
-        /// Gets the corresponding <see cref="Country"/> text (read-only where selected).
+        /// Gets the corresponding <c>Country</c> text (read-only where selected).
         /// </summary>
         public string? CountryText { get; set; }
 
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/PowerSource.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/PowerSource.cs
index 950585460..74ba69255 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/PowerSource.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/PowerSource.cs
@@ -26,7 +26,7 @@ public partial class PowerSource : ReferenceDataBase<Guid>
     }
 
     /// <summary>
-    /// Represents the <see cref="PowerSource"/> collection.
+    /// Represents the <c>PowerSource</c> collection.
     /// </summary>
     public partial class PowerSourceCollection : List<PowerSource> { }
 }
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/ProductArgs.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/ProductArgs.cs
index 4453a6c1c..968698e7d 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/ProductArgs.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/ProductArgs.cs
@@ -14,7 +14,7 @@
 namespace Beef.Demo.Common.Entities
 {
     /// <summary>
-    /// The <see cref="Product"/> arguments.
+    /// The <c>Product</c> arguments.
     /// </summary>
     public partial class ProductArgs
     {
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/Robot.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/Robot.cs
index fe96131d3..deeb9cd72 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/Robot.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/Robot.cs
@@ -19,7 +19,7 @@ namespace Beef.Demo.Common.Entities
     public partial class Robot : IIdentifier<Guid>, IETag, IChangeLog
     {
         /// <summary>
-        /// Gets or sets the <see cref="Robot"/> identifier.
+        /// Gets or sets the <c>Robot</c> identifier.
         /// </summary>
         public Guid Id { get; set; }
 
@@ -34,7 +34,7 @@ public partial class Robot : IIdentifier<Guid>, IETag, IChangeLog
         public string? SerialNo { get; set; }
 
         /// <summary>
-        /// Gets the corresponding <see cref="EyeColor"/> text (read-only where selected).
+        /// Gets the corresponding <c>EyeColor</c> text (read-only where selected).
         /// </summary>
         public string? EyeColorText { get; set; }
 
@@ -44,7 +44,7 @@ public partial class Robot : IIdentifier<Guid>, IETag, IChangeLog
         public string? EyeColor { get; set; }
 
         /// <summary>
-        /// Gets the corresponding <see cref="PowerSource"/> text (read-only where selected).
+        /// Gets the corresponding <c>PowerSource</c> text (read-only where selected).
         /// </summary>
         public string? PowerSourceText { get; set; }
 
@@ -66,12 +66,12 @@ public partial class Robot : IIdentifier<Guid>, IETag, IChangeLog
     }
 
     /// <summary>
-    /// Represents the <see cref="Robot"/> collection.
+    /// Represents the <c>Robot</c> collection.
     /// </summary>
     public partial class RobotCollection : List<Robot> { }
 
     /// <summary>
-    /// Represents the <see cref="Robot"/> collection result.
+    /// Represents the <c>Robot</c> collection result.
     /// </summary>
     public class RobotCollectionResult : CollectionResult<RobotCollection, Robot>
     {
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/RobotArgs.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/RobotArgs.cs
index 43d789fa5..bfe4e0f3d 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/RobotArgs.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/RobotArgs.cs
@@ -14,7 +14,7 @@
 namespace Beef.Demo.Common.Entities
 {
     /// <summary>
-    /// Represents the <see cref="Robot"/> arguments entity.
+    /// Represents the <c>Robot</c> arguments entity.
     /// </summary>
     public partial class RobotArgs
     {
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/Status.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/Status.cs
index b15d72d9d..76aab6075 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/Status.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/Status.cs
@@ -20,7 +20,7 @@ namespace Beef.Demo.Common.Entities
     public partial class Status : ReferenceDataBase<string?> { }
 
     /// <summary>
-    /// Represents the <see cref="Status"/> collection.
+    /// Represents the <c>Status</c> collection.
     /// </summary>
     public partial class StatusCollection : List<Status> { }
 }
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/USState.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/USState.cs
index 1676a3971..1d0d270b1 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/USState.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/USState.cs
@@ -20,7 +20,7 @@ namespace Beef.Demo.Common.Entities
     public partial class USState : ReferenceDataBase<Guid> { }
 
     /// <summary>
-    /// Represents the <see cref="USState"/> collection.
+    /// Represents the <c>USState</c> collection.
     /// </summary>
     public partial class USStateCollection : List<USState> { }
 }
diff --git a/samples/Demo/Beef.Demo.Common/Entities/Generated/WorkHistory.cs b/samples/Demo/Beef.Demo.Common/Entities/Generated/WorkHistory.cs
index 28dc5f7f6..b17408c69 100644
--- a/samples/Demo/Beef.Demo.Common/Entities/Generated/WorkHistory.cs
+++ b/samples/Demo/Beef.Demo.Common/Entities/Generated/WorkHistory.cs
@@ -19,7 +19,7 @@ namespace Beef.Demo.Common.Entities
     public partial class WorkHistory : IPrimaryKey
     {
         /// <summary>
-        /// Gets or sets the <see cref="Person"/> identifier (not serialized/read-only for internal data merging).
+        /// Gets or sets the <c>Person</c> identifier (not serialized/read-only for internal data merging).
         /// </summary>
         [JsonIgnore]
         public Guid PersonId { get; set; }
@@ -55,7 +55,7 @@ public partial class WorkHistory : IPrimaryKey
     }
 
     /// <summary>
-    /// Represents the <see cref="WorkHistory"/> collection.
+    /// Represents the <c>WorkHistory</c> collection.
     /// </summary>
     public partial class WorkHistoryCollection : List<WorkHistory> { }
 }
diff --git a/samples/Demo/Beef.Demo.Test/Beef.Demo.Test.csproj b/samples/Demo/Beef.Demo.Test/Beef.Demo.Test.csproj
index 6c5390895..4611529c7 100644
--- a/samples/Demo/Beef.Demo.Test/Beef.Demo.Test.csproj
+++ b/samples/Demo/Beef.Demo.Test/Beef.Demo.Test.csproj
@@ -52,7 +52,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.UnitTesting" Version="3.21.0" />
+    <PackageReference Include="CoreEx.UnitTesting" Version="3.21.1" />
     <PackageReference Include="NUnit.Analyzers" Version="4.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/samples/My.Hr/My.Hr.Api/Controllers/Generated/EmployeeController.cs b/samples/My.Hr/My.Hr.Api/Controllers/Generated/EmployeeController.cs
index d134d97b9..29c73f366 100644
--- a/samples/My.Hr/My.Hr.Api/Controllers/Generated/EmployeeController.cs
+++ b/samples/My.Hr/My.Hr.Api/Controllers/Generated/EmployeeController.cs
@@ -25,10 +25,10 @@ public EmployeeController(WebApi webApi, IEmployeeManager manager)
     partial void EmployeeControllerCtor(); // Enables additional functionality to be added to the constructor.
 
     /// <summary>
-    /// Gets the specified <see cref="Employee"/>.
+    /// Gets the specified <c>Employee</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Employee"/> identifier.</param>
-    /// <returns>The selected <see cref="Employee"/> where found.</returns>
+    /// <param name="id">The <c>Employee</c> identifier.</param>
+    /// <returns>The selected <c>Employee</c> where found.</returns>
     [HttpGet("employees/{id}", Name="Employee_Get")]
     [ProducesResponseType(typeof(Common.Entities.Employee), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NotFound)]
@@ -36,9 +36,9 @@ public Task<IActionResult> Get(Guid id)
         => _webApi.GetWithResultAsync<Employee?>(Request, p => _manager.GetAsync(id));
 
     /// <summary>
-    /// Creates a new <see cref="Employee"/>.
+    /// Creates a new <c>Employee</c>.
     /// </summary>
-    /// <returns>The created <see cref="Employee"/>.</returns>
+    /// <returns>The created <c>Employee</c>.</returns>
     [HttpPost("employees", Name="Employee_Create")]
     [AcceptsBody(typeof(Common.Entities.Employee))]
     [ProducesResponseType(typeof(Common.Entities.Employee), (int)HttpStatusCode.Created)]
@@ -46,10 +46,10 @@ public Task<IActionResult> Create()
         => _webApi.PostWithResultAsync<Employee, Employee>(Request, p => _manager.CreateAsync(p.Value!), statusCode: HttpStatusCode.Created, locationUri: r => new Uri($"/employees/{r.Id}", UriKind.Relative));
 
     /// <summary>
-    /// Updates an existing <see cref="Employee"/>.
+    /// Updates an existing <c>Employee</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Employee"/> identifier.</param>
-    /// <returns>The updated <see cref="Employee"/>.</returns>
+    /// <param name="id">The <c>Employee</c> identifier.</param>
+    /// <returns>The updated <c>Employee</c>.</returns>
     [HttpPut("employees/{id}", Name="Employee_Update")]
     [AcceptsBody(typeof(Common.Entities.Employee))]
     [ProducesResponseType(typeof(Common.Entities.Employee), (int)HttpStatusCode.OK)]
@@ -58,10 +58,10 @@ public Task<IActionResult> Update(Guid id)
         => _webApi.PutWithResultAsync<Employee, Employee>(Request, p => _manager.UpdateAsync(p.Value!, id));
 
     /// <summary>
-    /// Patches an existing <see cref="Employee"/>.
+    /// Patches an existing <c>Employee</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Employee"/> identifier.</param>
-    /// <returns>The patched <see cref="Employee"/>.</returns>
+    /// <param name="id">The <c>Employee</c> identifier.</param>
+    /// <returns>The patched <c>Employee</c>.</returns>
     [HttpPatch("employees/{id}", Name="Employee_Patch")]
     [AcceptsBody(typeof(Common.Entities.Employee), HttpConsts.MergePatchMediaTypeName)]
     [ProducesResponseType(typeof(Common.Entities.Employee), (int)HttpStatusCode.OK)]
@@ -70,24 +70,24 @@ public Task<IActionResult> Patch(Guid id)
         => _webApi.PatchWithResultAsync<Employee>(Request, get: _ => _manager.GetAsync(id), put: p => _manager.UpdateAsync(p.Value!, id));
 
     /// <summary>
-    /// Deletes the specified <see cref="Employee"/>.
+    /// Deletes the specified <c>Employee</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Employee"/> identifier.</param>
+    /// <param name="id">The <c>Employee</c> identifier.</param>
     [HttpDelete("employees/{id}", Name="Employee_Delete")]
     [ProducesResponseType((int)HttpStatusCode.NoContent)]
     public Task<IActionResult> Delete(Guid id)
         => _webApi.DeleteWithResultAsync(Request, p => _manager.DeleteAsync(id));
 
     /// <summary>
-    /// Gets the <see cref="EmployeeBaseCollectionResult"/> that contains the items that match the selection criteria.
+    /// Gets the <c>EmployeeBase</c> array that contains the items that match the selection criteria.
     /// </summary>
     /// <param name="firstName">The First Name.</param>
     /// <param name="lastName">The Last Name.</param>
-    /// <param name="genders">The Genders (see <see cref="RefDataNamespace.Gender"/>).</param>
+    /// <param name="genders">The Genders.</param>
     /// <param name="startFrom">The Start From.</param>
     /// <param name="startTo">The Start To.</param>
     /// <param name="isIncludeTerminated">Indicates whether Is Include Terminated.</param>
-    /// <returns>The <see cref="EmployeeBaseCollection"/></returns>
+    /// <returns>The <c>EmployeeBase</c> array</returns>
     [HttpGet("employees", Name="Employee_GetByArgs")]
     [Paging]
     [ProducesResponseType(typeof(Common.Entities.EmployeeBaseCollection), (int)HttpStatusCode.OK)]
@@ -99,10 +99,10 @@ public Task<IActionResult> GetByArgs(string? firstName = default, string? lastNa
     }
 
     /// <summary>
-    /// Terminates an existing <see cref="Employee"/>.
+    /// Terminates an existing <c>Employee</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Employee"/> identifier.</param>
-    /// <returns>The updated <see cref="Employee"/>.</returns>
+    /// <param name="id">The <c>Employee</c> identifier.</param>
+    /// <returns>The updated <c>Employee</c>.</returns>
     [HttpPost("employees/{id}/terminate", Name="Employee_Terminate")]
     [AcceptsBody(typeof(Common.Entities.TerminationDetail))]
     [ProducesResponseType(typeof(Common.Entities.Employee), (int)HttpStatusCode.OK)]
diff --git a/samples/My.Hr/My.Hr.Api/Controllers/Generated/PerformanceReviewController.cs b/samples/My.Hr/My.Hr.Api/Controllers/Generated/PerformanceReviewController.cs
index 9f95871a9..5b843b49c 100644
--- a/samples/My.Hr/My.Hr.Api/Controllers/Generated/PerformanceReviewController.cs
+++ b/samples/My.Hr/My.Hr.Api/Controllers/Generated/PerformanceReviewController.cs
@@ -25,10 +25,10 @@ public PerformanceReviewController(WebApi webApi, IPerformanceReviewManager mana
     partial void PerformanceReviewControllerCtor(); // Enables additional functionality to be added to the constructor.
 
     /// <summary>
-    /// Gets the specified <see cref="PerformanceReview"/>.
+    /// Gets the specified <c>PerformanceReview</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Employee"/> identifier.</param>
-    /// <returns>The selected <see cref="PerformanceReview"/> where found.</returns>
+    /// <param name="id">The <c>Employee</c> identifier.</param>
+    /// <returns>The selected <c>PerformanceReview</c> where found.</returns>
     [HttpGet("reviews/{id}", Name="PerformanceReview_Get")]
     [ProducesResponseType(typeof(Common.Entities.PerformanceReview), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NotFound)]
@@ -36,10 +36,10 @@ public Task<IActionResult> Get(Guid id)
         => _webApi.GetWithResultAsync<PerformanceReview?>(Request, p => _manager.GetAsync(id));
 
     /// <summary>
-    /// Gets the <see cref="PerformanceReviewCollectionResult"/> that contains the items that match the selection criteria.
+    /// Gets the <c>PerformanceReview</c> array that contains the items that match the selection criteria.
     /// </summary>
-    /// <param name="employeeId">The <see cref="Employee.Id"/>.</param>
-    /// <returns>The <see cref="PerformanceReviewCollection"/></returns>
+    /// <param name="employeeId">The <c>Employee.Id</c>.</param>
+    /// <returns>The <c>PerformanceReview</c> array</returns>
     [HttpGet("employees/{employeeId}/reviews", Name="PerformanceReview_GetByEmployeeId")]
     [Paging]
     [ProducesResponseType(typeof(Common.Entities.PerformanceReviewCollection), (int)HttpStatusCode.OK)]
@@ -48,10 +48,10 @@ public Task<IActionResult> GetByEmployeeId(Guid employeeId)
         => _webApi.GetWithResultAsync<PerformanceReviewCollectionResult>(Request, p => _manager.GetByEmployeeIdAsync(employeeId, p.RequestOptions.Paging), alternateStatusCode: HttpStatusCode.NoContent);
 
     /// <summary>
-    /// Creates a new <see cref="PerformanceReview"/>.
+    /// Creates a new <c>PerformanceReview</c>.
     /// </summary>
-    /// <param name="employeeId">The <see cref="Employee.Id"/>.</param>
-    /// <returns>The created <see cref="PerformanceReview"/>.</returns>
+    /// <param name="employeeId">The <c>Employee.Id</c>.</param>
+    /// <returns>The created <c>PerformanceReview</c>.</returns>
     [HttpPost("employees/{employeeId}/reviews", Name="PerformanceReview_Create")]
     [AcceptsBody(typeof(Common.Entities.PerformanceReview))]
     [ProducesResponseType(typeof(Common.Entities.PerformanceReview), (int)HttpStatusCode.Created)]
@@ -59,10 +59,10 @@ public Task<IActionResult> Create(Guid employeeId)
         => _webApi.PostWithResultAsync<PerformanceReview, PerformanceReview>(Request, p => _manager.CreateAsync(p.Value!, employeeId), statusCode: HttpStatusCode.Created, locationUri: r => new Uri($"/reviews/{r.Id}", UriKind.Relative));
 
     /// <summary>
-    /// Updates an existing <see cref="PerformanceReview"/>.
+    /// Updates an existing <c>PerformanceReview</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Employee"/> identifier.</param>
-    /// <returns>The updated <see cref="PerformanceReview"/>.</returns>
+    /// <param name="id">The <c>Employee</c> identifier.</param>
+    /// <returns>The updated <c>PerformanceReview</c>.</returns>
     [HttpPut("reviews/{id}", Name="PerformanceReview_Update")]
     [AcceptsBody(typeof(Common.Entities.PerformanceReview))]
     [ProducesResponseType(typeof(Common.Entities.PerformanceReview), (int)HttpStatusCode.OK)]
@@ -71,10 +71,10 @@ public Task<IActionResult> Update(Guid id)
         => _webApi.PutWithResultAsync<PerformanceReview, PerformanceReview>(Request, p => _manager.UpdateAsync(p.Value!, id));
 
     /// <summary>
-    /// Patches an existing <see cref="PerformanceReview"/>.
+    /// Patches an existing <c>PerformanceReview</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Employee"/> identifier.</param>
-    /// <returns>The patched <see cref="PerformanceReview"/>.</returns>
+    /// <param name="id">The <c>Employee</c> identifier.</param>
+    /// <returns>The patched <c>PerformanceReview</c>.</returns>
     [HttpPatch("reviews/{id}", Name="PerformanceReview_Patch")]
     [AcceptsBody(typeof(Common.Entities.PerformanceReview), HttpConsts.MergePatchMediaTypeName)]
     [ProducesResponseType(typeof(Common.Entities.PerformanceReview), (int)HttpStatusCode.OK)]
@@ -83,9 +83,9 @@ public Task<IActionResult> Patch(Guid id)
         => _webApi.PatchWithResultAsync<PerformanceReview>(Request, get: _ => _manager.GetAsync(id), put: p => _manager.UpdateAsync(p.Value!, id));
 
     /// <summary>
-    /// Deletes the specified <see cref="PerformanceReview"/>.
+    /// Deletes the specified <c>PerformanceReview</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Employee"/> identifier.</param>
+    /// <param name="id">The <c>Employee</c> identifier.</param>
     [HttpDelete("reviews/{id}", Name="PerformanceReview_Delete")]
     [ProducesResponseType((int)HttpStatusCode.NoContent)]
     public Task<IActionResult> Delete(Guid id)
diff --git a/samples/My.Hr/My.Hr.Api/Controllers/Generated/ReferenceDataController.cs b/samples/My.Hr/My.Hr.Api/Controllers/Generated/ReferenceDataController.cs
index 5d63a3346..2321205a2 100644
--- a/samples/My.Hr/My.Hr.Api/Controllers/Generated/ReferenceDataController.cs
+++ b/samples/My.Hr/My.Hr.Api/Controllers/Generated/ReferenceDataController.cs
@@ -25,55 +25,55 @@ public ReferenceDataController(ReferenceDataContentWebApi webApi, ReferenceDataO
         { _webApi = webApi.ThrowIfNull(); _orchestrator = orchestrator.ThrowIfNull(); }
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.Gender"/> reference data items that match the specified criteria.
+    /// Gets all of the 'Gender' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.Gender collection.</returns>
+    /// <returns>The 'Gender' array.</returns>
     [HttpGet("ref/genders", Name="ReferenceData_GenderGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.Gender>), (int)HttpStatusCode.OK)]
     public Task<IActionResult> GenderGetAll([FromQuery] IEnumerable<string>? codes = default, string? text = default)
         => _webApi.GetAsync(Request, p => _orchestrator.GetWithFilterAsync<RefDataNamespace.Gender>(codes, text, p.RequestOptions.IncludeInactive));
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.TerminationReason"/> reference data items that match the specified criteria.
+    /// Gets all of the 'TerminationReason' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.TerminationReason collection.</returns>
+    /// <returns>The 'TerminationReason' array.</returns>
     [HttpGet("ref/terminationReasons", Name="ReferenceData_TerminationReasonGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.TerminationReason>), (int)HttpStatusCode.OK)]
     public Task<IActionResult> TerminationReasonGetAll([FromQuery] IEnumerable<string>? codes = default, string? text = default)
         => _webApi.GetAsync(Request, p => _orchestrator.GetWithFilterAsync<RefDataNamespace.TerminationReason>(codes, text, p.RequestOptions.IncludeInactive));
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.RelationshipType"/> reference data items that match the specified criteria.
+    /// Gets all of the 'RelationshipType' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.RelationshipType collection.</returns>
+    /// <returns>The 'RelationshipType' array.</returns>
     [HttpGet("ref/relationshipTypes", Name="ReferenceData_RelationshipTypeGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.RelationshipType>), (int)HttpStatusCode.OK)]
     public Task<IActionResult> RelationshipTypeGetAll([FromQuery] IEnumerable<string>? codes = default, string? text = default)
         => _webApi.GetAsync(Request, p => _orchestrator.GetWithFilterAsync<RefDataNamespace.RelationshipType>(codes, text, p.RequestOptions.IncludeInactive));
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.USState"/> reference data items that match the specified criteria.
+    /// Gets all of the 'USState' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.USState collection.</returns>
+    /// <returns>The 'USState' array.</returns>
     [HttpGet("ref/usStates", Name="ReferenceData_USStateGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.USState>), (int)HttpStatusCode.OK)]
     public Task<IActionResult> USStateGetAll([FromQuery] IEnumerable<string>? codes = default, string? text = default)
         => _webApi.GetAsync(Request, p => _orchestrator.GetWithFilterAsync<RefDataNamespace.USState>(codes, text, p.RequestOptions.IncludeInactive));
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.PerformanceOutcome"/> reference data items that match the specified criteria.
+    /// Gets all of the 'PerformanceOutcome' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.PerformanceOutcome collection.</returns>
+    /// <returns>The 'PerformanceOutcome' array.</returns>
     [HttpGet("ref/performanceOutcomes", Name="ReferenceData_PerformanceOutcomeGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.PerformanceOutcome>), (int)HttpStatusCode.OK)]
     public Task<IActionResult> PerformanceOutcomeGetAll([FromQuery] IEnumerable<string>? codes = default, string? text = default)
@@ -82,7 +82,7 @@ public Task<IActionResult> PerformanceOutcomeGetAll([FromQuery] IEnumerable<stri
     /// <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>
-    /// <returns>A <see cref="ReferenceDataMultiDictionary"/>.</returns>
+    /// <returns>The 'ReferenceDataMultiDictionary'.</returns>
     [HttpGet("ref", Name="ReferenceData_GetNamed")]
     [ProducesResponseType(typeof(CoreEx.RefData.ReferenceDataMultiDictionary), (int)HttpStatusCode.OK)]
     public Task<IActionResult> GetNamed() => _webApi.GetAsync(Request, p => _orchestrator.GetNamedAsync(p.RequestOptions));
diff --git a/samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj b/samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj
index a9eebd395..b175e56a5 100644
--- a/samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj
+++ b/samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.21.0" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.21.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
     <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.6.2" />
   </ItemGroup>
diff --git a/samples/My.Hr/My.Hr.Business/Generated/ReferenceDataProvider.cs b/samples/My.Hr/My.Hr.Business/Generated/ReferenceDataProvider.cs
index 89ba024a3..c269e7d2f 100644
--- a/samples/My.Hr/My.Hr.Business/Generated/ReferenceDataProvider.cs
+++ b/samples/My.Hr/My.Hr.Business/Generated/ReferenceDataProvider.cs
@@ -20,14 +20,14 @@ public partial class ReferenceDataProvider : IReferenceDataProvider
     partial void ReferenceDataProviderCtor(); // Enables the ReferenceDataProvider constructor to be extended.
 
     /// <inheritdoc/>
-    public Type[] Types => new Type[] 
-    {
+    public Type[] Types =>
+    [
         typeof(RefDataNamespace.Gender),
         typeof(RefDataNamespace.TerminationReason),
         typeof(RefDataNamespace.RelationshipType),
         typeof(RefDataNamespace.USState),
         typeof(RefDataNamespace.PerformanceOutcome)
-    };
+    ];
 
     /// <inheritdoc/>
     public Task<Result<IReferenceDataCollection>> GetAsync(Type type, CancellationToken cancellationToken = default) => _dataService.GetAsync(type);
diff --git a/samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj b/samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj
index 711dc4a3e..106d8b33f 100644
--- a/samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj
+++ b/samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj
@@ -6,10 +6,10 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.21.0" />
-    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.21.0" />
-    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.21.0" />
-    <PackageReference Include="CoreEx.Validation" Version="3.21.0" />
+    <PackageReference Include="CoreEx" Version="3.21.1" />
+    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.21.1" />
+    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.21.1" />
+    <PackageReference Include="CoreEx.Validation" Version="3.21.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.31" />
   </ItemGroup>
 </Project>
\ 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 5ed80c08e..dff848ba6 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/Address.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/Address.cs
@@ -31,7 +31,7 @@ public partial class Address
         public string? City { get; set; }
 
         /// <summary>
-        /// Gets the corresponding <see cref="State"/> text (read-only where selected).
+        /// Gets the corresponding <c>State</c> text (read-only where selected).
         /// </summary>
         public string? StateText { 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 13fe31c1e..65469dfa0 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/EmergencyContact.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/EmergencyContact.cs
@@ -36,7 +36,7 @@ public partial class EmergencyContact : IIdentifier<Guid>
         public string? PhoneNo { get; set; }
 
         /// <summary>
-        /// Gets the corresponding <see cref="Relationship"/> text (read-only where selected).
+        /// Gets the corresponding <c>Relationship</c> text (read-only where selected).
         /// </summary>
         public string? RelationshipText { get; set; }
 
@@ -47,7 +47,7 @@ public partial class EmergencyContact : IIdentifier<Guid>
     }
 
     /// <summary>
-    /// Represents the <see cref="EmergencyContact"/> collection.
+    /// Represents the <c>EmergencyContact</c> collection.
     /// </summary>
     public partial class EmergencyContactCollection : List<EmergencyContact> { }
 }
\ No newline at end of file
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 53697695d..63ba17012 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/EmployeeArgs.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/EmployeeArgs.cs
@@ -11,7 +11,7 @@
 namespace My.Hr.Common.Entities
 {
     /// <summary>
-    /// Represents the <see cref="Employee"/> search arguments entity.
+    /// Represents the <c>Employee</c> search arguments entity.
     /// </summary>
     public partial class EmployeeArgs
     {
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 c050274b8..3ff8df7b6 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/EmployeeBase.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/EmployeeBase.cs
@@ -11,17 +11,17 @@
 namespace My.Hr.Common.Entities
 {
     /// <summary>
-    /// Represents the <see cref="Employee"/> base entity.
+    /// Represents the <c>Employee</c> base entity.
     /// </summary>
     public partial class EmployeeBase : IIdentifier<Guid>
     {
         /// <summary>
-        /// Gets or sets the <see cref="Employee"/> identifier.
+        /// Gets or sets the <c>Employee</c> identifier.
         /// </summary>
         public Guid Id { get; set; }
 
         /// <summary>
-        /// Gets or sets the Unique <see cref="Employee"/> Email.
+        /// Gets or sets the Unique <c>Employee</c> Email.
         /// </summary>
         public string? Email { get; set; }
 
@@ -36,7 +36,7 @@ public partial class EmployeeBase : IIdentifier<Guid>
         public string? LastName { get; set; }
 
         /// <summary>
-        /// Gets the corresponding <see cref="Gender"/> text (read-only where selected).
+        /// Gets the corresponding <c>Gender</c> text (read-only where selected).
         /// </summary>
         public string? GenderText { get; set; }
 
@@ -67,12 +67,12 @@ public partial class EmployeeBase : IIdentifier<Guid>
     }
 
     /// <summary>
-    /// Represents the <see cref="EmployeeBase"/> collection.
+    /// Represents the <c>EmployeeBase</c> collection.
     /// </summary>
     public partial class EmployeeBaseCollection : List<EmployeeBase> { }
 
     /// <summary>
-    /// Represents the <see cref="EmployeeBase"/> collection result.
+    /// Represents the <c>EmployeeBase</c> collection result.
     /// </summary>
     public class EmployeeBaseCollectionResult : CollectionResult<EmployeeBaseCollection, EmployeeBase>
     {
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 49f1417fa..5bd562787 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/Gender.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/Gender.cs
@@ -17,7 +17,7 @@ namespace My.Hr.Common.Entities
     public partial class Gender : ReferenceDataBase<Guid> { }
 
     /// <summary>
-    /// Represents the <see cref="Gender"/> collection.
+    /// Represents the <c>Gender</c> collection.
     /// </summary>
     public partial class GenderCollection : List<Gender> { }
 }
\ No newline at end of file
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 962aba538..e1c1261d4 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/PerformanceOutcome.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/PerformanceOutcome.cs
@@ -17,7 +17,7 @@ namespace My.Hr.Common.Entities
     public partial class PerformanceOutcome : ReferenceDataBase<Guid> { }
 
     /// <summary>
-    /// Represents the <see cref="PerformanceOutcome"/> collection.
+    /// Represents the <c>PerformanceOutcome</c> collection.
     /// </summary>
     public partial class PerformanceOutcomeCollection : List<PerformanceOutcome> { }
 }
\ No newline at end of file
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 32c6f60b8..77615746b 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/PerformanceReview.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/PerformanceReview.cs
@@ -16,12 +16,12 @@ namespace My.Hr.Common.Entities
     public partial class PerformanceReview : IIdentifier<Guid>, IETag, IChangeLog
     {
         /// <summary>
-        /// Gets or sets the <see cref="Employee"/> identifier.
+        /// Gets or sets the <c>Employee</c> identifier.
         /// </summary>
         public Guid Id { get; set; }
 
         /// <summary>
-        /// Gets or sets the <see cref="Employee.Id"/> (value is immutable).
+        /// Gets or sets the <c>Employee.Id</c> (value is immutable).
         /// </summary>
         public Guid EmployeeId { get; set; }
 
@@ -31,7 +31,7 @@ public partial class PerformanceReview : IIdentifier<Guid>, IETag, IChangeLog
         public DateTime Date { get; set; }
 
         /// <summary>
-        /// Gets the corresponding <see cref="Outcome"/> text (read-only where selected).
+        /// Gets the corresponding <c>Outcome</c> text (read-only where selected).
         /// </summary>
         public string? OutcomeText { get; set; }
 
@@ -63,12 +63,12 @@ public partial class PerformanceReview : IIdentifier<Guid>, IETag, IChangeLog
     }
 
     /// <summary>
-    /// Represents the <see cref="PerformanceReview"/> collection.
+    /// Represents the <c>PerformanceReview</c> collection.
     /// </summary>
     public partial class PerformanceReviewCollection : List<PerformanceReview> { }
 
     /// <summary>
-    /// Represents the <see cref="PerformanceReview"/> collection result.
+    /// Represents the <c>PerformanceReview</c> collection result.
     /// </summary>
     public class PerformanceReviewCollectionResult : CollectionResult<PerformanceReviewCollection, PerformanceReview>
     {
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 dea568604..266d0a04d 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/RelationshipType.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/RelationshipType.cs
@@ -17,7 +17,7 @@ namespace My.Hr.Common.Entities
     public partial class RelationshipType : ReferenceDataBase<Guid> { }
 
     /// <summary>
-    /// Represents the <see cref="RelationshipType"/> collection.
+    /// Represents the <c>RelationshipType</c> collection.
     /// </summary>
     public partial class RelationshipTypeCollection : List<RelationshipType> { }
 }
\ No newline at end of file
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 c5ccc4e3b..76c13b4be 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/TerminationDetail.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/TerminationDetail.cs
@@ -21,7 +21,7 @@ public partial class TerminationDetail
         public DateTime Date { get; set; }
 
         /// <summary>
-        /// Gets the corresponding <see cref="Reason"/> text (read-only where selected).
+        /// Gets the corresponding <c>Reason</c> text (read-only where selected).
         /// </summary>
         public string? ReasonText { 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 12f8a217f..ab0740cff 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/TerminationReason.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/TerminationReason.cs
@@ -17,7 +17,7 @@ namespace My.Hr.Common.Entities
     public partial class TerminationReason : ReferenceDataBase<Guid> { }
 
     /// <summary>
-    /// Represents the <see cref="TerminationReason"/> collection.
+    /// Represents the <c>TerminationReason</c> collection.
     /// </summary>
     public partial class TerminationReasonCollection : List<TerminationReason> { }
 }
\ No newline at end of file
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 3744ce868..81d827b89 100644
--- a/samples/My.Hr/My.Hr.Common/Entities/Generated/USState.cs
+++ b/samples/My.Hr/My.Hr.Common/Entities/Generated/USState.cs
@@ -17,7 +17,7 @@ namespace My.Hr.Common.Entities
     public partial class USState : ReferenceDataBase<Guid> { }
 
     /// <summary>
-    /// Represents the <see cref="USState"/> collection.
+    /// Represents the <c>USState</c> collection.
     /// </summary>
     public partial class USStateCollection : List<USState> { }
 }
\ 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 308f6d977..68500b5d3 100644
--- a/samples/My.Hr/My.Hr.Common/My.Hr.Common.csproj
+++ b/samples/My.Hr/My.Hr.Common/My.Hr.Common.csproj
@@ -4,6 +4,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.21.0" />
+    <PackageReference Include="CoreEx" Version="3.21.1" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Test/My.Hr.Test.csproj b/samples/My.Hr/My.Hr.Test/My.Hr.Test.csproj
index 051764875..bfce4ba78 100644
--- a/samples/My.Hr/My.Hr.Test/My.Hr.Test.csproj
+++ b/samples/My.Hr/My.Hr.Test/My.Hr.Test.csproj
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.21.0" />
+    <PackageReference Include="CoreEx" Version="3.21.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -42,7 +42,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.21.0" />
+    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.21.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/MyEf.Hr/MyEf.Hr.Api/Controllers/Generated/EmployeeController.cs b/samples/MyEf.Hr/MyEf.Hr.Api/Controllers/Generated/EmployeeController.cs
index abbf62608..721e627ce 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Api/Controllers/Generated/EmployeeController.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Api/Controllers/Generated/EmployeeController.cs
@@ -25,10 +25,10 @@ public EmployeeController(WebApi webApi, IEmployeeManager manager)
     partial void EmployeeControllerCtor(); // Enables additional functionality to be added to the constructor.
 
     /// <summary>
-    /// Gets the specified <see cref="Employee"/>.
+    /// Gets the specified <c>Employee</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Employee"/> identifier.</param>
-    /// <returns>The selected <see cref="Employee"/> where found.</returns>
+    /// <param name="id">The <c>Employee</c> identifier.</param>
+    /// <returns>The selected <c>Employee</c> where found.</returns>
     [HttpGet("employees/{id}", Name="Employee_Get")]
     [ProducesResponseType(typeof(Common.Entities.Employee), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NotFound)]
@@ -36,9 +36,9 @@ public Task<IActionResult> Get(Guid id)
         => _webApi.GetWithResultAsync<Employee?>(Request, p => _manager.GetAsync(id));
 
     /// <summary>
-    /// Creates a new <see cref="Employee"/>.
+    /// Creates a new <c>Employee</c>.
     /// </summary>
-    /// <returns>The created <see cref="Employee"/>.</returns>
+    /// <returns>The created <c>Employee</c>.</returns>
     [HttpPost("employees", Name="Employee_Create")]
     [AcceptsBody(typeof(Common.Entities.Employee))]
     [ProducesResponseType(typeof(Common.Entities.Employee), (int)HttpStatusCode.Created)]
@@ -46,10 +46,10 @@ public Task<IActionResult> Create()
         => _webApi.PostWithResultAsync<Employee, Employee>(Request, p => _manager.CreateAsync(p.Value!), statusCode: HttpStatusCode.Created, locationUri: r => new Uri($"/employees/{r.Id}", UriKind.Relative));
 
     /// <summary>
-    /// Updates an existing <see cref="Employee"/>.
+    /// Updates an existing <c>Employee</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Employee"/> identifier.</param>
-    /// <returns>The updated <see cref="Employee"/>.</returns>
+    /// <param name="id">The <c>Employee</c> identifier.</param>
+    /// <returns>The updated <c>Employee</c>.</returns>
     [HttpPut("employees/{id}", Name="Employee_Update")]
     [AcceptsBody(typeof(Common.Entities.Employee))]
     [ProducesResponseType(typeof(Common.Entities.Employee), (int)HttpStatusCode.OK)]
@@ -58,10 +58,10 @@ public Task<IActionResult> Update(Guid id)
         => _webApi.PutWithResultAsync<Employee, Employee>(Request, p => _manager.UpdateAsync(p.Value!, id));
 
     /// <summary>
-    /// Patches an existing <see cref="Employee"/>.
+    /// Patches an existing <c>Employee</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Employee"/> identifier.</param>
-    /// <returns>The patched <see cref="Employee"/>.</returns>
+    /// <param name="id">The <c>Employee</c> identifier.</param>
+    /// <returns>The patched <c>Employee</c>.</returns>
     [HttpPatch("employees/{id}", Name="Employee_Patch")]
     [AcceptsBody(typeof(Common.Entities.Employee), HttpConsts.MergePatchMediaTypeName)]
     [ProducesResponseType(typeof(Common.Entities.Employee), (int)HttpStatusCode.OK)]
@@ -70,24 +70,24 @@ public Task<IActionResult> Patch(Guid id)
         => _webApi.PatchWithResultAsync<Employee>(Request, get: _ => _manager.GetAsync(id), put: p => _manager.UpdateAsync(p.Value!, id));
 
     /// <summary>
-    /// Deletes the specified <see cref="Employee"/>.
+    /// Deletes the specified <c>Employee</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Employee"/> identifier.</param>
+    /// <param name="id">The <c>Employee</c> identifier.</param>
     [HttpDelete("employees/{id}", Name="Employee_Delete")]
     [ProducesResponseType((int)HttpStatusCode.NoContent)]
     public Task<IActionResult> Delete(Guid id)
         => _webApi.DeleteWithResultAsync(Request, p => _manager.DeleteAsync(id));
 
     /// <summary>
-    /// Gets the <see cref="EmployeeBaseCollectionResult"/> that contains the items that match the selection criteria.
+    /// Gets the <c>EmployeeBase</c> array that contains the items that match the selection criteria.
     /// </summary>
     /// <param name="firstName">The First Name.</param>
     /// <param name="lastName">The Last Name.</param>
-    /// <param name="genders">The Genders (see <see cref="RefDataNamespace.Gender"/>).</param>
+    /// <param name="genders">The Genders.</param>
     /// <param name="startFrom">The Start From.</param>
     /// <param name="startTo">The Start To.</param>
     /// <param name="isIncludeTerminated">Indicates whether Is Include Terminated.</param>
-    /// <returns>The <see cref="EmployeeBaseCollection"/></returns>
+    /// <returns>The <c>EmployeeBase</c> array</returns>
     [HttpGet("employees", Name="Employee_GetByArgs")]
     [Paging]
     [ProducesResponseType(typeof(Common.Entities.EmployeeBaseCollection), (int)HttpStatusCode.OK)]
@@ -99,10 +99,10 @@ public Task<IActionResult> GetByArgs(string? firstName = default, string? lastNa
     }
 
     /// <summary>
-    /// Terminates an existing <see cref="Employee"/>.
+    /// Terminates an existing <c>Employee</c>.
     /// </summary>
-    /// <param name="id">The <see cref="Employee"/> identifier.</param>
-    /// <returns>The updated <see cref="Employee"/>.</returns>
+    /// <param name="id">The <c>Employee</c> identifier.</param>
+    /// <returns>The updated <c>Employee</c>.</returns>
     [HttpPost("employees/{id}/terminate", Name="Employee_Terminate")]
     [AcceptsBody(typeof(Common.Entities.TerminationDetail))]
     [ProducesResponseType(typeof(Common.Entities.Employee), (int)HttpStatusCode.OK)]
diff --git a/samples/MyEf.Hr/MyEf.Hr.Api/Controllers/Generated/PerformanceReviewController.cs b/samples/MyEf.Hr/MyEf.Hr.Api/Controllers/Generated/PerformanceReviewController.cs
index 42d633480..5ae90f913 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Api/Controllers/Generated/PerformanceReviewController.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Api/Controllers/Generated/PerformanceReviewController.cs
@@ -25,10 +25,10 @@ public PerformanceReviewController(WebApi webApi, IPerformanceReviewManager mana
     partial void PerformanceReviewControllerCtor(); // Enables additional functionality to be added to the constructor.
 
     /// <summary>
-    /// Gets the specified <see cref="PerformanceReview"/>.
+    /// Gets the specified <c>PerformanceReview</c>.
     /// </summary>
-    /// <param name="id">The <see cref="PerformanceReview"/> identifier.</param>
-    /// <returns>The selected <see cref="PerformanceReview"/> where found.</returns>
+    /// <param name="id">The <c>PerformanceReview</c> identifier.</param>
+    /// <returns>The selected <c>PerformanceReview</c> where found.</returns>
     [HttpGet("reviews/{id}", Name="PerformanceReview_Get")]
     [ProducesResponseType(typeof(Common.Entities.PerformanceReview), (int)HttpStatusCode.OK)]
     [ProducesResponseType((int)HttpStatusCode.NotFound)]
@@ -36,10 +36,10 @@ public Task<IActionResult> Get(Guid id)
         => _webApi.GetWithResultAsync<PerformanceReview?>(Request, p => _manager.GetAsync(id));
 
     /// <summary>
-    /// Updates an existing <see cref="PerformanceReview"/>.
+    /// Updates an existing <c>PerformanceReview</c>.
     /// </summary>
-    /// <param name="id">The <see cref="PerformanceReview"/> identifier.</param>
-    /// <returns>The updated <see cref="PerformanceReview"/>.</returns>
+    /// <param name="id">The <c>PerformanceReview</c> identifier.</param>
+    /// <returns>The updated <c>PerformanceReview</c>.</returns>
     [HttpPut("reviews/{id}", Name="PerformanceReview_Update")]
     [AcceptsBody(typeof(Common.Entities.PerformanceReview))]
     [ProducesResponseType(typeof(Common.Entities.PerformanceReview), (int)HttpStatusCode.OK)]
@@ -48,10 +48,10 @@ public Task<IActionResult> Update(Guid id)
         => _webApi.PutWithResultAsync<PerformanceReview, PerformanceReview>(Request, p => _manager.UpdateAsync(p.Value!, id));
 
     /// <summary>
-    /// Patches an existing <see cref="PerformanceReview"/>.
+    /// Patches an existing <c>PerformanceReview</c>.
     /// </summary>
-    /// <param name="id">The <see cref="PerformanceReview"/> identifier.</param>
-    /// <returns>The patched <see cref="PerformanceReview"/>.</returns>
+    /// <param name="id">The <c>PerformanceReview</c> identifier.</param>
+    /// <returns>The patched <c>PerformanceReview</c>.</returns>
     [HttpPatch("reviews/{id}", Name="PerformanceReview_Patch")]
     [AcceptsBody(typeof(Common.Entities.PerformanceReview), HttpConsts.MergePatchMediaTypeName)]
     [ProducesResponseType(typeof(Common.Entities.PerformanceReview), (int)HttpStatusCode.OK)]
@@ -60,19 +60,19 @@ public Task<IActionResult> Patch(Guid id)
         => _webApi.PatchWithResultAsync<PerformanceReview>(Request, get: _ => _manager.GetAsync(id), put: p => _manager.UpdateAsync(p.Value!, id));
 
     /// <summary>
-    /// Deletes the specified <see cref="PerformanceReview"/>.
+    /// Deletes the specified <c>PerformanceReview</c>.
     /// </summary>
-    /// <param name="id">The <see cref="PerformanceReview"/> identifier.</param>
+    /// <param name="id">The <c>PerformanceReview</c> identifier.</param>
     [HttpDelete("reviews/{id}", Name="PerformanceReview_Delete")]
     [ProducesResponseType((int)HttpStatusCode.NoContent)]
     public Task<IActionResult> Delete(Guid id)
         => _webApi.DeleteWithResultAsync(Request, p => _manager.DeleteAsync(id));
 
     /// <summary>
-    /// Gets the <see cref="PerformanceReviewCollectionResult"/> that contains the items that match the selection criteria.
+    /// Gets the <c>PerformanceReview</c> array that contains the items that match the selection criteria.
     /// </summary>
-    /// <param name="employeeId">The <see cref="Employee"/> identifier.</param>
-    /// <returns>The <see cref="PerformanceReviewCollection"/></returns>
+    /// <param name="employeeId">The <c>Employee</c> identifier.</param>
+    /// <returns>The <c>PerformanceReview</c> array</returns>
     [HttpGet("employees/{employeeId}/reviews", Name="PerformanceReview_GetByEmployeeId")]
     [Paging]
     [ProducesResponseType(typeof(Common.Entities.PerformanceReviewCollection), (int)HttpStatusCode.OK)]
@@ -81,10 +81,10 @@ public Task<IActionResult> GetByEmployeeId(Guid employeeId)
         => _webApi.GetWithResultAsync<PerformanceReviewCollectionResult>(Request, p => _manager.GetByEmployeeIdAsync(employeeId, p.RequestOptions.Paging), alternateStatusCode: HttpStatusCode.NoContent);
 
     /// <summary>
-    /// Creates a new <see cref="PerformanceReview"/>.
+    /// Creates a new <c>PerformanceReview</c>.
     /// </summary>
-    /// <param name="employeeId">The <see cref="Employee"/> identifier.</param>
-    /// <returns>The created <see cref="PerformanceReview"/>.</returns>
+    /// <param name="employeeId">The <c>Employee</c> identifier.</param>
+    /// <returns>The created <c>PerformanceReview</c>.</returns>
     [HttpPost("employees/{employeeId}/reviews", Name="PerformanceReview_Create")]
     [AcceptsBody(typeof(Common.Entities.PerformanceReview))]
     [ProducesResponseType(typeof(Common.Entities.PerformanceReview), (int)HttpStatusCode.Created)]
diff --git a/samples/MyEf.Hr/MyEf.Hr.Api/Controllers/Generated/ReferenceDataController.cs b/samples/MyEf.Hr/MyEf.Hr.Api/Controllers/Generated/ReferenceDataController.cs
index 80f0c45fd..6b8d8d23d 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Api/Controllers/Generated/ReferenceDataController.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Api/Controllers/Generated/ReferenceDataController.cs
@@ -25,55 +25,55 @@ public ReferenceDataController(ReferenceDataContentWebApi webApi, ReferenceDataO
         { _webApi = webApi.ThrowIfNull(); _orchestrator = orchestrator.ThrowIfNull(); }
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.Gender"/> reference data items that match the specified criteria.
+    /// Gets all of the 'Gender' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.Gender collection.</returns>
+    /// <returns>The 'Gender' array.</returns>
     [HttpGet("ref/genders", Name="ReferenceData_GenderGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.Gender>), (int)HttpStatusCode.OK)]
     public Task<IActionResult> GenderGetAll([FromQuery] IEnumerable<string>? codes = default, string? text = default)
         => _webApi.GetAsync(Request, p => _orchestrator.GetWithFilterAsync<RefDataNamespace.Gender>(codes, text, p.RequestOptions.IncludeInactive));
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.TerminationReason"/> reference data items that match the specified criteria.
+    /// Gets all of the 'TerminationReason' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.TerminationReason collection.</returns>
+    /// <returns>The 'TerminationReason' array.</returns>
     [HttpGet("ref/terminationreasons", Name="ReferenceData_TerminationReasonGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.TerminationReason>), (int)HttpStatusCode.OK)]
     public Task<IActionResult> TerminationReasonGetAll([FromQuery] IEnumerable<string>? codes = default, string? text = default)
         => _webApi.GetAsync(Request, p => _orchestrator.GetWithFilterAsync<RefDataNamespace.TerminationReason>(codes, text, p.RequestOptions.IncludeInactive));
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.RelationshipType"/> reference data items that match the specified criteria.
+    /// Gets all of the 'RelationshipType' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.RelationshipType collection.</returns>
+    /// <returns>The 'RelationshipType' array.</returns>
     [HttpGet("ref/relationshiptypes", Name="ReferenceData_RelationshipTypeGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.RelationshipType>), (int)HttpStatusCode.OK)]
     public Task<IActionResult> RelationshipTypeGetAll([FromQuery] IEnumerable<string>? codes = default, string? text = default)
         => _webApi.GetAsync(Request, p => _orchestrator.GetWithFilterAsync<RefDataNamespace.RelationshipType>(codes, text, p.RequestOptions.IncludeInactive));
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.USState"/> reference data items that match the specified criteria.
+    /// Gets all of the 'USState' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.USState collection.</returns>
+    /// <returns>The 'USState' array.</returns>
     [HttpGet("ref/usstates", Name="ReferenceData_USStateGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.USState>), (int)HttpStatusCode.OK)]
     public Task<IActionResult> USStateGetAll([FromQuery] IEnumerable<string>? codes = default, string? text = default)
         => _webApi.GetAsync(Request, p => _orchestrator.GetWithFilterAsync<RefDataNamespace.USState>(codes, text, p.RequestOptions.IncludeInactive));
 
     /// <summary> 
-    /// Gets all of the <see cref="RefDataNamespace.PerformanceOutcome"/> reference data items that match the specified criteria.
+    /// Gets all of the 'PerformanceOutcome' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A RefDataNamespace.PerformanceOutcome collection.</returns>
+    /// <returns>The 'PerformanceOutcome' array.</returns>
     [HttpGet("ref/performanceoutcomes", Name="ReferenceData_PerformanceOutcomeGetAll")]
     [ProducesResponseType(typeof(IEnumerable<CommonRefDataNamespace.PerformanceOutcome>), (int)HttpStatusCode.OK)]
     public Task<IActionResult> PerformanceOutcomeGetAll([FromQuery] IEnumerable<string>? codes = default, string? text = default)
@@ -82,7 +82,7 @@ public Task<IActionResult> PerformanceOutcomeGetAll([FromQuery] IEnumerable<stri
     /// <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>
-    /// <returns>A <see cref="ReferenceDataMultiDictionary"/>.</returns>
+    /// <returns>The 'ReferenceDataMultiDictionary'.</returns>
     [HttpGet("ref", Name="ReferenceData_GetNamed")]
     [ProducesResponseType(typeof(CoreEx.RefData.ReferenceDataMultiDictionary), (int)HttpStatusCode.OK)]
     public Task<IActionResult> GetNamed() => _webApi.GetAsync(Request, p => _orchestrator.GetNamedAsync(p.RequestOptions));
diff --git a/samples/MyEf.Hr/MyEf.Hr.Api/MyEf.Hr.Api.csproj b/samples/MyEf.Hr/MyEf.Hr.Api/MyEf.Hr.Api.csproj
index 706550276..4631e03fc 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Api/MyEf.Hr.Api.csproj
+++ b/samples/MyEf.Hr/MyEf.Hr.Api/MyEf.Hr.Api.csproj
@@ -6,8 +6,8 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.21.0" />
-    <PackageReference Include="CoreEx.Azure" Version="3.21.0" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.21.1" />
+    <PackageReference Include="CoreEx.Azure" Version="3.21.1" />
     <PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.9" />
     <PackageReference Include="AspNetCore.HealthChecks.Azure.Storage.Blobs" Version="8.0.1" />
     <PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.2.0" />
diff --git a/samples/MyEf.Hr/MyEf.Hr.Api/Startup.cs b/samples/MyEf.Hr/MyEf.Hr.Api/Startup.cs
index 07d80245a..1aa37d740 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Api/Startup.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Api/Startup.cs
@@ -96,6 +96,11 @@ public void ConfigureServices(IServiceCollection services)
                 if (File.Exists(xmlFile))
                     options.IncludeXmlComments(xmlFile);
 
+                xmlName = $"{Assembly.GetEntryAssembly()!.GetName().Name}.xml".Replace(".Api", ".Common");
+                xmlFile = Path.Combine(AppContext.BaseDirectory, xmlName);
+                if (File.Exists(xmlFile))
+                    options.IncludeXmlComments(xmlFile);
+
                 options.OperationFilter<AcceptsBodyOperationFilter>();  // Needed to support AcceptsBodyAttribute where body parameter not explicitly defined.
                 options.OperationFilter<PagingOperationFilter>();       // Needed to support PagingAttribute where PagingArgs parameter not explicitly defined.
             });
diff --git a/samples/MyEf.Hr/MyEf.Hr.Business/Generated/ReferenceDataProvider.cs b/samples/MyEf.Hr/MyEf.Hr.Business/Generated/ReferenceDataProvider.cs
index c62aa3dc5..d0cdfc0a7 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Business/Generated/ReferenceDataProvider.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Business/Generated/ReferenceDataProvider.cs
@@ -20,14 +20,14 @@ public partial class ReferenceDataProvider : IReferenceDataProvider
     partial void ReferenceDataProviderCtor(); // Enables the ReferenceDataProvider constructor to be extended.
 
     /// <inheritdoc/>
-    public Type[] Types => new Type[] 
-    {
+    public Type[] Types =>
+    [
         typeof(RefDataNamespace.Gender),
         typeof(RefDataNamespace.TerminationReason),
         typeof(RefDataNamespace.RelationshipType),
         typeof(RefDataNamespace.USState),
         typeof(RefDataNamespace.PerformanceOutcome)
-    };
+    ];
 
     /// <inheritdoc/>
     public Task<Result<IReferenceDataCollection>> GetAsync(Type type, CancellationToken cancellationToken = default) => _dataService.GetAsync(type);
diff --git a/samples/MyEf.Hr/MyEf.Hr.Business/MyEf.Hr.Business.csproj b/samples/MyEf.Hr/MyEf.Hr.Business/MyEf.Hr.Business.csproj
index 9ec88db8f..67636d3fa 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Business/MyEf.Hr.Business.csproj
+++ b/samples/MyEf.Hr/MyEf.Hr.Business/MyEf.Hr.Business.csproj
@@ -6,11 +6,11 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.21.0" />
-    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.21.0" />
-    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.21.0" />
-    <PackageReference Include="CoreEx.Validation" Version="3.21.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
+    <PackageReference Include="CoreEx" Version="3.21.1" />
+    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.21.1" />
+    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.21.1" />
+    <PackageReference Include="CoreEx.Validation" Version="3.21.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Data\EfModel\Generated\" />
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 9ce13bd20..b6186cddf 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/Address.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/Address.cs
@@ -31,7 +31,7 @@ public partial class Address
         public string? City { get; set; }
 
         /// <summary>
-        /// Gets the corresponding <see cref="State"/> text (read-only where selected).
+        /// Gets the corresponding <c>State</c> text (read-only where selected).
         /// </summary>
         public string? StateText { 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 4b443dc94..d6b620c08 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/EmergencyContact.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/EmergencyContact.cs
@@ -36,7 +36,7 @@ public partial class EmergencyContact : IIdentifier<Guid>
         public string? PhoneNo { get; set; }
 
         /// <summary>
-        /// Gets the corresponding <see cref="Relationship"/> text (read-only where selected).
+        /// Gets the corresponding <c>Relationship</c> text (read-only where selected).
         /// </summary>
         public string? RelationshipText { get; set; }
 
@@ -47,7 +47,7 @@ public partial class EmergencyContact : IIdentifier<Guid>
     }
 
     /// <summary>
-    /// Represents the <see cref="EmergencyContact"/> collection.
+    /// Represents the <c>EmergencyContact</c> collection.
     /// </summary>
     public partial class EmergencyContactCollection : List<EmergencyContact> { }
 }
\ 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 c3433d5a1..ee89fa0bb 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/EmployeeArgs.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/EmployeeArgs.cs
@@ -11,7 +11,7 @@
 namespace MyEf.Hr.Common.Entities
 {
     /// <summary>
-    /// Represents the <see cref="Employee"/> Arguments entity.
+    /// Represents the <c>Employee</c> Arguments entity.
     /// </summary>
     public partial class EmployeeArgs
     {
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 fc121eb15..ff939d26e 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/EmployeeBase.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/EmployeeBase.cs
@@ -11,17 +11,17 @@
 namespace MyEf.Hr.Common.Entities
 {
     /// <summary>
-    /// Represents the <see cref="Employee"/> base entity.
+    /// Represents the <c>Employee</c> base entity.
     /// </summary>
     public partial class EmployeeBase : IIdentifier<Guid>
     {
         /// <summary>
-        /// Gets or sets the <see cref="Employee"/> identifier.
+        /// Gets or sets the <c>Employee</c> identifier.
         /// </summary>
         public Guid Id { get; set; }
 
         /// <summary>
-        /// Gets or sets the Unique <see cref="Employee"/> Email.
+        /// Gets or sets the Unique <c>Employee</c> Email.
         /// </summary>
         public string? Email { get; set; }
 
@@ -36,7 +36,7 @@ public partial class EmployeeBase : IIdentifier<Guid>
         public string? LastName { get; set; }
 
         /// <summary>
-        /// Gets the corresponding <see cref="Gender"/> text (read-only where selected).
+        /// Gets the corresponding <c>Gender</c> text (read-only where selected).
         /// </summary>
         public string? GenderText { get; set; }
 
@@ -67,12 +67,12 @@ public partial class EmployeeBase : IIdentifier<Guid>
     }
 
     /// <summary>
-    /// Represents the <see cref="EmployeeBase"/> collection.
+    /// Represents the <c>EmployeeBase</c> collection.
     /// </summary>
     public partial class EmployeeBaseCollection : List<EmployeeBase> { }
 
     /// <summary>
-    /// Represents the <see cref="EmployeeBase"/> collection result.
+    /// Represents the <c>EmployeeBase</c> collection result.
     /// </summary>
     public class EmployeeBaseCollectionResult : CollectionResult<EmployeeBaseCollection, EmployeeBase>
     {
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 9d112cdb4..d0f45420a 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/Gender.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/Gender.cs
@@ -17,7 +17,7 @@ namespace MyEf.Hr.Common.Entities
     public partial class Gender : ReferenceDataBase<Guid> { }
 
     /// <summary>
-    /// Represents the <see cref="Gender"/> collection.
+    /// Represents the <c>Gender</c> collection.
     /// </summary>
     public partial class GenderCollection : List<Gender> { }
 }
\ No newline at end of file
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 3e256701e..3f4be7b15 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/PerformanceOutcome.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/PerformanceOutcome.cs
@@ -17,7 +17,7 @@ namespace MyEf.Hr.Common.Entities
     public partial class PerformanceOutcome : ReferenceDataBase<Guid> { }
 
     /// <summary>
-    /// Represents the <see cref="PerformanceOutcome"/> collection.
+    /// Represents the <c>PerformanceOutcome</c> collection.
     /// </summary>
     public partial class PerformanceOutcomeCollection : List<PerformanceOutcome> { }
 }
\ No newline at end of file
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 015cc8fe3..925ae5574 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/PerformanceReview.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/PerformanceReview.cs
@@ -16,12 +16,12 @@ namespace MyEf.Hr.Common.Entities
     public partial class PerformanceReview : IIdentifier<Guid>, IETag, IChangeLog
     {
         /// <summary>
-        /// Gets or sets the <see cref="PerformanceReview"/> identifier.
+        /// Gets or sets the <c>PerformanceReview</c> identifier.
         /// </summary>
         public Guid Id { get; set; }
 
         /// <summary>
-        /// Gets or sets the <see cref="Employee.Id"/> (value is immutable).
+        /// Gets or sets the <c>Employee.Id</c> (value is immutable).
         /// </summary>
         public Guid EmployeeId { get; set; }
 
@@ -31,7 +31,7 @@ public partial class PerformanceReview : IIdentifier<Guid>, IETag, IChangeLog
         public DateTime Date { get; set; }
 
         /// <summary>
-        /// Gets the corresponding <see cref="Outcome"/> text (read-only where selected).
+        /// Gets the corresponding <c>Outcome</c> text (read-only where selected).
         /// </summary>
         public string? OutcomeText { get; set; }
 
@@ -63,12 +63,12 @@ public partial class PerformanceReview : IIdentifier<Guid>, IETag, IChangeLog
     }
 
     /// <summary>
-    /// Represents the <see cref="PerformanceReview"/> collection.
+    /// Represents the <c>PerformanceReview</c> collection.
     /// </summary>
     public partial class PerformanceReviewCollection : List<PerformanceReview> { }
 
     /// <summary>
-    /// Represents the <see cref="PerformanceReview"/> collection result.
+    /// Represents the <c>PerformanceReview</c> collection result.
     /// </summary>
     public class PerformanceReviewCollectionResult : CollectionResult<PerformanceReviewCollection, PerformanceReview>
     {
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 e09ddd024..203a0e225 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/RelationshipType.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/RelationshipType.cs
@@ -17,7 +17,7 @@ namespace MyEf.Hr.Common.Entities
     public partial class RelationshipType : ReferenceDataBase<Guid> { }
 
     /// <summary>
-    /// Represents the <see cref="RelationshipType"/> collection.
+    /// Represents the <c>RelationshipType</c> collection.
     /// </summary>
     public partial class RelationshipTypeCollection : List<RelationshipType> { }
 }
\ No newline at end of file
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 e2cbd313d..712ba3c7d 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/TerminationDetail.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/TerminationDetail.cs
@@ -21,7 +21,7 @@ public partial class TerminationDetail
         public DateTime Date { get; set; }
 
         /// <summary>
-        /// Gets the corresponding <see cref="Reason"/> text (read-only where selected).
+        /// Gets the corresponding <c>Reason</c> text (read-only where selected).
         /// </summary>
         public string? ReasonText { 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 1a4230196..5673b7a42 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/TerminationReason.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/TerminationReason.cs
@@ -17,7 +17,7 @@ namespace MyEf.Hr.Common.Entities
     public partial class TerminationReason : ReferenceDataBase<Guid> { }
 
     /// <summary>
-    /// Represents the <see cref="TerminationReason"/> collection.
+    /// Represents the <c>TerminationReason</c> collection.
     /// </summary>
     public partial class TerminationReasonCollection : List<TerminationReason> { }
 }
\ No newline at end of file
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 1254c57c3..977e77989 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/USState.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/Entities/Generated/USState.cs
@@ -17,7 +17,7 @@ namespace MyEf.Hr.Common.Entities
     public partial class USState : ReferenceDataBase<Guid> { }
 
     /// <summary>
-    /// Represents the <see cref="USState"/> collection.
+    /// Represents the <c>USState</c> collection.
     /// </summary>
     public partial class USStateCollection : List<USState> { }
 }
\ 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 308f6d977..7ef1735a5 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/MyEf.Hr.Common.csproj
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/MyEf.Hr.Common.csproj
@@ -2,8 +2,9 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <Nullable>enable</Nullable>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.21.0" />
+    <PackageReference Include="CoreEx" Version="3.21.1" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/MyEf.Hr/MyEf.Hr.Security.Subscriptions/MyEf.Hr.Security.Subscriptions.csproj b/samples/MyEf.Hr/MyEf.Hr.Security.Subscriptions/MyEf.Hr.Security.Subscriptions.csproj
index 844840230..c95cf3c7a 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Security.Subscriptions/MyEf.Hr.Security.Subscriptions.csproj
+++ b/samples/MyEf.Hr/MyEf.Hr.Security.Subscriptions/MyEf.Hr.Security.Subscriptions.csproj
@@ -15,14 +15,14 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.Azure" Version="3.21.0" />
-    <PackageReference Include="CoreEx.Validation" Version="3.21.0" />
+    <PackageReference Include="CoreEx.Azure" Version="3.21.1" />
+    <PackageReference Include="CoreEx.Validation" Version="3.21.1" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.22.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.ServiceBus" Version="5.20.0" />
-    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.17.2" />
+    <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.17.3" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="1.2.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.22.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.7" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MyEf.Hr.Common\MyEf.Hr.Common.csproj" />
diff --git a/samples/MyEf.Hr/MyEf.Hr.Security.Test/MyEf.Hr.Security.Test.csproj b/samples/MyEf.Hr/MyEf.Hr.Security.Test/MyEf.Hr.Security.Test.csproj
index 188a1a48a..6bf3a537b 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Security.Test/MyEf.Hr.Security.Test.csproj
+++ b/samples/MyEf.Hr/MyEf.Hr.Security.Test/MyEf.Hr.Security.Test.csproj
@@ -27,7 +27,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.21.0" />
+    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.21.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/MyEf.Hr/MyEf.Hr.Test/MyEf.Hr.Test.csproj b/samples/MyEf.Hr/MyEf.Hr.Test/MyEf.Hr.Test.csproj
index 33bfff765..caa5f1eb3 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Test/MyEf.Hr.Test.csproj
+++ b/samples/MyEf.Hr/MyEf.Hr.Test/MyEf.Hr.Test.csproj
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.21.0" />
+    <PackageReference Include="CoreEx" Version="3.21.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -42,7 +42,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.21.0" />
+    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.21.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/templates/Beef.Template.Solution/content/.template.config/template.json b/templates/Beef.Template.Solution/content/.template.config/template.json
index d9a30bbef..d7d6d3252 100644
--- a/templates/Beef.Template.Solution/content/.template.config/template.json
+++ b/templates/Beef.Template.Solution/content/.template.config/template.json
@@ -85,7 +85,7 @@
       "type": "generated",
       "generator": "constant",
       "parameters": {
-        "value": "3.21.0"
+        "value": "3.21.1"
       },
       "replaces": "CoreExVersion"
     },
@@ -93,7 +93,7 @@
       "type": "generated",
       "generator": "constant",
       "parameters": {
-        "value": "5.12.9"
+        "value": "5.13.0"
       },
       "replaces": "BeefVersion"
     },
@@ -192,7 +192,7 @@
         },
         {
           "condition": "(!implement_cosmos)",
-          "exclude": [ "Company.AppName.Business/Data/CosmosDb.cs", "Company.AppName.Test/Cosmos/**/*", "Company.AppName.CodeGen/datamodel.beef-5.yaml" ]
+          "exclude": [ "Company.AppName.Business/Data/AppNameCosmosDb.cs", "Company.AppName.Test/Cosmos/**/*", "Company.AppName.CodeGen/datamodel.beef-5.yaml" ]
         },
         {
           "condition": "(!implement_httpagent)",
diff --git a/templates/Beef.Template.Solution/content/Company.AppName.Api/Company.AppName.Api.csproj b/templates/Beef.Template.Solution/content/Company.AppName.Api/Company.AppName.Api.csproj
index 97cf61c54..ce7a7e49a 100644
--- a/templates/Beef.Template.Solution/content/Company.AppName.Api/Company.AppName.Api.csproj
+++ b/templates/Beef.Template.Solution/content/Company.AppName.Api/Company.AppName.Api.csproj
@@ -6,7 +6,7 @@
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.1.0" />
+    <PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.2.0" />
     <PackageReference Include="CoreEx.AspNetCore" Version="CoreExVersion" />
     <!--#if (implement_services) -->
     <PackageReference Include="CoreEx.Azure" Version="CoreExVersion" />
diff --git a/templates/Beef.Template.Solution/content/Company.AppName.Api/Properties/launchSettings.json b/templates/Beef.Template.Solution/content/Company.AppName.Api/Properties/launchSettings.json
index a58189392..c54a6c05f 100644
--- a/templates/Beef.Template.Solution/content/Company.AppName.Api/Properties/launchSettings.json
+++ b/templates/Beef.Template.Solution/content/Company.AppName.Api/Properties/launchSettings.json
@@ -1,26 +1,10 @@
 {
   "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false, 
-    "anonymousAuthentication": true, 
-    "iisExpress": {
-      "applicationUrl": "http://localhost:64784",
-      "sslPort": 0
-    }
-  },
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
     "Company.AppName.Api": {
       "commandName": "Project",
       "launchBrowser": true,
-      "launchUrl": "swagger",
+      "launchUrl": "",
       "applicationUrl": "http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/templates/Beef.Template.Solution/content/Company.AppName.Api/Startup.cs b/templates/Beef.Template.Solution/content/Company.AppName.Api/Startup.cs
index 4bf194404..7fafb915d 100644
--- a/templates/Beef.Template.Solution/content/Company.AppName.Api/Startup.cs
+++ b/templates/Beef.Template.Solution/content/Company.AppName.Api/Startup.cs
@@ -48,11 +48,11 @@ public void ConfigureServices(IServiceCollection services)
 #endif
 #if (implement_cosmos)
         // Add the cosmos database.
-        services.AddSingleton<ICosmos>(sp =>
+        services.AddSingleton(sp =>
         {
             var settings = sp.GetRequiredService<AppNameSettings>();
             var cco = new AzCosmos.CosmosClientOptions { SerializerOptions = new AzCosmos.CosmosSerializationOptions { PropertyNamingPolicy = AzCosmos.CosmosPropertyNamingPolicy.CamelCase, IgnoreNullValues = true } };
-            return new CosmosDb(new AzCosmos.CosmosClient(settings.CosmosConnectionString, cco).GetDatabase(settings.CosmosDatabaseId), sp.GetRequiredService<CoreEx.Mapping.IMapper>());
+            return new AppNameCosmosDb(new AzCosmos.CosmosClient(settings.CosmosConnectionString, cco).GetDatabase(settings.CosmosDatabaseId), sp.GetRequiredService<CoreEx.Mapping.IMapper>());
         });
 
 #endif
diff --git a/templates/Beef.Template.Solution/content/Company.AppName.Business/Data/CosmosDb.cs b/templates/Beef.Template.Solution/content/Company.AppName.Business/Data/AppNameCosmosDb.cs
similarity index 66%
rename from templates/Beef.Template.Solution/content/Company.AppName.Business/Data/CosmosDb.cs
rename to templates/Beef.Template.Solution/content/Company.AppName.Business/Data/AppNameCosmosDb.cs
index f8eeb8397..79528dcc5 100644
--- a/templates/Beef.Template.Solution/content/Company.AppName.Business/Data/CosmosDb.cs
+++ b/templates/Beef.Template.Solution/content/Company.AppName.Business/Data/AppNameCosmosDb.cs
@@ -3,20 +3,15 @@
 namespace Company.AppName.Business.Data;
 
 /// <summary>
-/// Enables the <b>Company.AppName</b> CosmosDb client.
+/// Provides the <b>Company.AppName</b> CosmosDb client.
 /// </summary>
-public interface ICosmos : CoreEx.Cosmos.ICosmosDb
+/// <param name="database">The <see cref="Database"/>.</param>
+/// <param name="mapper">The <see cref="IMapper"/>.</param>
+/// <param name="invoker">The optional <see cref="CosmosDbInvoker"/>.</param>
+public class AppNameCosmosDb(Database database, IMapper mapper, CosmosDbInvoker? invoker = null) : CoreEx.Cosmos.CosmosDb(database, mapper, invoker) 
 {
     /// <summary>
     /// Exposes <see cref="Person"/> entity from the <b>Person</b> container.
     /// </summary>
     public CosmosDbContainer<Person, Model.Person> Persons => Container<Person, Model.Person>("Person");
-}
-
-/// <summary>
-/// Provides the <b>Company.AppName</b> CosmosDb client.
-/// </summary>
-/// <param name="database">The <see cref="Database"/>.</param>
-/// <param name="mapper">The <see cref="IMapper"/>.</param>
-/// <param name="invoker">The optional <see cref="CosmosDbInvoker"/>.</param>
-public class CosmosDb(Database database, IMapper mapper, CosmosDbInvoker? invoker = null) : CoreEx.Cosmos.CosmosDb(database, mapper, invoker), ICosmos { }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/templates/Beef.Template.Solution/content/Company.AppName.CodeGen/entity.beef-5.yaml b/templates/Beef.Template.Solution/content/Company.AppName.CodeGen/entity.beef-5.yaml
index c4b23f822..d6773d6fb 100644
--- a/templates/Beef.Template.Solution/content/Company.AppName.CodeGen/entity.beef-5.yaml
+++ b/templates/Beef.Template.Solution/content/Company.AppName.CodeGen/entity.beef-5.yaml
@@ -84,7 +84,7 @@ entities:
   }
 //#endif
 //#if (implement_cosmos)
-cosmosName: ICosmos
+cosmosName: AppNameCosmosDb
 eventSubjectRoot: Company
 eventActionFormat: PastTense
 eventSourceRoot: Company/AppName
diff --git a/templates/Beef.Template.Solution/content/Company.AppName.CodeGen/refdata.beef-5.yaml b/templates/Beef.Template.Solution/content/Company.AppName.CodeGen/refdata.beef-5.yaml
index 1450eff3d..faeccd1af 100644
--- a/templates/Beef.Template.Solution/content/Company.AppName.CodeGen/refdata.beef-5.yaml
+++ b/templates/Beef.Template.Solution/content/Company.AppName.CodeGen/refdata.beef-5.yaml
@@ -31,7 +31,7 @@ entities:
   - { name: Gender, entityFrameworkModel: EfModel.Gender }
 //#endif
 //#if (implement_cosmos)
-cosmosName: ICosmos
+cosmosName: AppNameCosmosDb
 refDataType: Guid
 autoImplement: Cosmos
 entities:
diff --git a/templates/Beef.Template.Solution/content/Company.AppName.Services.Test/Company.AppName.Services.Test.csproj b/templates/Beef.Template.Solution/content/Company.AppName.Services.Test/Company.AppName.Services.Test.csproj
index 933ddedd6..1df6640b7 100644
--- a/templates/Beef.Template.Solution/content/Company.AppName.Services.Test/Company.AppName.Services.Test.csproj
+++ b/templates/Beef.Template.Solution/content/Company.AppName.Services.Test/Company.AppName.Services.Test.csproj
@@ -31,8 +31,8 @@
 
   <ItemGroup>
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.1.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="CoreExVersion" />
     <PackageReference Include="coverlet.collector" Version="6.0.2" >
       <PrivateAssets>all</PrivateAssets>
diff --git a/templates/Beef.Template.Solution/content/Company.AppName.Test/Apis/FixtureSetup.cs b/templates/Beef.Template.Solution/content/Company.AppName.Test/Apis/FixtureSetup.cs
index 8f5deb0f1..cf778eb1a 100644
--- a/templates/Beef.Template.Solution/content/Company.AppName.Test/Apis/FixtureSetup.cs
+++ b/templates/Beef.Template.Solution/content/Company.AppName.Test/Apis/FixtureSetup.cs
@@ -40,7 +40,7 @@ public void OneTimeSetUp()
             if (count == 0)
             {
                 using var test = ApiTester.Create<Startup>();
-                var cosmosDb = test.Services.GetRequiredService<ICosmos>();
+                var cosmosDb = test.Services.GetRequiredService<AppNameCosmosDb>();
 
                 await cosmosDb.Database.Client.CreateDatabaseIfNotExistsAsync(cosmosDb.Database.Id, cancellationToken: ct).ConfigureAwait(false);
 
@@ -61,7 +61,7 @@ public void OneTimeSetUp()
                 await cosmosDb.Persons.ImportBatchAsync(jdr, cancellationToken: ct).ConfigureAwait(false);
 
                 jdr = JsonDataReader.ParseYaml<FixtureSetUp>("RefData.yaml", new JsonDataReaderArgs(new CoreEx.Text.Json.ReferenceDataContentJsonSerializer()));
-                await cosmosDb.ImportValueBatchAsync("RefData", jdr, test.Services.GetRequiredService<CoreEx.RefData.ReferenceDataOrchestrator>().GetAllTypes(), cancellationToken: ct).ConfigureAwait(false);
+                await cosmosDb.ImportValueBatchAsync("RefData", jdr, ReferenceDataOrchestrator.GetAllTypesInNamespace<Business.Data.Model.Gender>(), cancellationToken: ct).ConfigureAwait(false);
             }
 
             return true;
diff --git a/templates/Beef.Template.Solution/content/Company.AppName.Test/Company.AppName.Test.csproj b/templates/Beef.Template.Solution/content/Company.AppName.Test/Company.AppName.Test.csproj
index 4c8fe826e..7e8b1cbac 100644
--- a/templates/Beef.Template.Solution/content/Company.AppName.Test/Company.AppName.Test.csproj
+++ b/templates/Beef.Template.Solution/content/Company.AppName.Test/Company.AppName.Test.csproj
@@ -31,8 +31,8 @@
 
   <ItemGroup>
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.1.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="CoreExVersion" />
     <PackageReference Include="coverlet.collector" Version="6.0.2" >
       <PrivateAssets>all</PrivateAssets>
diff --git a/tools/Beef.CodeGen.Core/Beef.CodeGen.Core.csproj b/tools/Beef.CodeGen.Core/Beef.CodeGen.Core.csproj
index d1e4e9fcd..f679c7035 100644
--- a/tools/Beef.CodeGen.Core/Beef.CodeGen.Core.csproj
+++ b/tools/Beef.CodeGen.Core/Beef.CodeGen.Core.csproj
@@ -23,6 +23,7 @@
   <ItemGroup>
     <None Remove="ExtendedHelp.txt" />
     <None Remove="Templates\EntityIWebApiAgent_cs.hbs" />
+    <None Remove="templates\OpenApi_yaml.hbs" />
     <None Remove="Templates\ReferenceDataIWebApiAgent_cs.hbs" />
   </ItemGroup>
   
@@ -33,6 +34,7 @@
   <ItemGroup>
     <PackageReference Include="OnRamp" Version="2.2.0" />
     <PackageReference Include="DbEx" Version="2.5.8" />
+    <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.15" />
   </ItemGroup>
 
   <Import Project="..\..\Common.targets" />
diff --git a/tools/Beef.CodeGen.Core/CodeGenConsole.cs b/tools/Beef.CodeGen.Core/CodeGenConsole.cs
index cd9d8041f..64e0696c9 100644
--- a/tools/Beef.CodeGen.Core/CodeGenConsole.cs
+++ b/tools/Beef.CodeGen.Core/CodeGenConsole.cs
@@ -1,5 +1,7 @@
 // Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/Beef
 
+using Beef.CodeGen.OpenApi;
+using CoreEx;
 using CoreEx.Abstractions;
 using McMaster.Extensions.CommandLineUtils;
 using Microsoft.Extensions.Logging;
@@ -9,7 +11,6 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Reflection;
 using System.Threading.Tasks;
 
@@ -29,6 +30,7 @@ public class CodeGenConsole : OnRamp.Console.CodeGenConsole
         private string _databaseScript = "Database.yaml";
 
         private CommandArgument<CommandType>? _cmdArg;
+        private CommandArgument? _additionalArgs;
 
         /// <summary>
         /// Gets the 'Company' <see cref="CodeGeneratorArgsBase.Parameters"/> name.
@@ -192,10 +194,22 @@ public CodeGenConsole DatabaseConnectionString(string connectionString)
             return this;
         }
 
+        /// <summary>
+        /// Add or replace the <see cref="OpenApiArgs"/> to the underlying <see cref="OnRamp.Console.CodeGenConsole.Args"/>.
+        /// </summary>
+        /// <param name="openApiArgs">The <see cref="OpenApiArgs"/>.</param>
+        /// <returns>The current instance to supported fluent-style method-chaining.</returns>
+        public CodeGenConsole WithOpenApiArgs(OpenApiArgs openApiArgs)
+        {
+            Args.Parameters[nameof(OpenApiArgs)] = openApiArgs.ThrowIfNull(nameof(openApiArgs));
+            return this;
+        }
+
         /// <inheritdoc/>
         protected override void OnBeforeExecute(CommandLineApplication app)
         {
             _cmdArg = app.Argument<CommandType>("command", "Execution command type.", false).IsRequired();
+            _additionalArgs = app.Argument("args", "Additional arguments for the 'OpenApi' command (further described).", multipleValues: true);
 
             using var sr = Resource.GetStreamReader<CodeGenConsole>("ExtendedHelp.txt");
             app.ExtendedHelpText = sr.ReadToEnd();
@@ -270,6 +284,9 @@ protected override async Task<CodeGenStatistics> OnCodeGenerationAsync()
             if (cmd.HasFlag(CommandType.EndPoints))
                 await ExecuteEndpointsAsync(exedir, company, appName).ConfigureAwait(false);
 
+            if (cmd.HasFlag(CommandType.OpenApi))
+                await ExecuteOpenApiAsync(exedir).ConfigureAwait(false);
+
             if (count > 1)
             {
                 Args.Logger?.LogInformation("{Content}", new string('-', 80));
@@ -334,7 +351,6 @@ private void ExecuteClean()
             Args.Logger?.LogInformation("{Content}", $"Exclude:  {string.Join(", ", exclude)}");
             Args.Logger?.LogInformation("{Content}", string.Empty);
 
-
             // Use the count logic to detemine all paths with specified exclusions.
             var sw = Stopwatch.StartNew();
             var dcs = new DirectoryCountStatistics(Args.OutputDirectory, exclude);
@@ -472,5 +488,33 @@ private async Task ExecuteEndpointsAsync(string? exedir, string company, string
             var cg = await OnRamp.CodeGenerator.CreateAsync<CodeGenerator>(args).ConfigureAwait(false);
             return (Config.Entity.CodeGenConfig)await cg.LoadConfigAsync().ConfigureAwait(false);
         }
+
+        /// <summary>
+        /// Execute the OpenAPI processing.
+        /// </summary>
+        private async Task ExecuteOpenApiAsync(string exedir)
+        {
+            if (_additionalArgs!.Values.Count != 1)
+                throw new CodeGenException("The OpenAPI document path must be specified as the only argument.");
+
+            Args.Logger?.LogInformation("{Content}", "  ** Code-generation of temporary entity YAML requested **");
+
+            // Read in the specified document.
+            var args = new CodeGeneratorArgs();
+            args.CopyFrom(Args);
+            args.OutputDirectory = new DirectoryInfo(exedir!);
+            
+            var oac = await OpenApiConverter.ReadAsync(args, _additionalArgs.Value!).ConfigureAwait(false);
+
+            // Convert the OpenAPI document and generate the Beef YAML.
+            var fi = await oac.ConvertAsync().ConfigureAwait(false);
+
+            // Done, boom!
+            Args.Logger?.LogInformation("{Content}", string.Empty);
+            Args.Logger?.LogWarning("{Content}", $"Temporary entity file created: {fi.FullName}");
+            Args.Logger?.LogInformation("{Content}", string.Empty);
+            Args.Logger?.LogInformation("{Content}", "Copy and paste generated contents into their respective files and amend accordingly.");
+            Args.Logger?.LogInformation("{Content}", $"Once complete it is recommended that the '{fi.Name}' file is deleted, as it is otherwise not used.");
+        }
     }
 }
\ No newline at end of file
diff --git a/tools/Beef.CodeGen.Core/CodeGenFileManager.cs b/tools/Beef.CodeGen.Core/CodeGenFileManager.cs
index 121d9b28d..bc76bdd09 100644
--- a/tools/Beef.CodeGen.Core/CodeGenFileManager.cs
+++ b/tools/Beef.CodeGen.Core/CodeGenFileManager.cs
@@ -12,6 +12,11 @@ namespace Beef.CodeGen
     /// </summary>
     public static class CodeGenFileManager
     {
+        /// <summary>
+        /// Gets the temporary entity file name.
+        /// </summary>
+        public static string TemporaryEntityFilename { get; } = "temp.entity.beef-5.yaml";
+
         /// <summary>
         /// Gets the list of supported <see cref="CommandType.Entity"/> filenames (will search in order specified).
         /// </summary>
diff --git a/tools/Beef.CodeGen.Core/CodeGenerator.cs b/tools/Beef.CodeGen.Core/CodeGenerator.cs
index d8b476af2..8058dee83 100644
--- a/tools/Beef.CodeGen.Core/CodeGenerator.cs
+++ b/tools/Beef.CodeGen.Core/CodeGenerator.cs
@@ -1,15 +1,18 @@
 // Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/Beef
 
 using Beef.CodeGen.Config.Entity;
+using HandlebarsDotNet;
 using Microsoft.Extensions.Logging;
 using OnRamp;
 using OnRamp.Scripts;
 using OnRamp.Utility;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.IO;
 using System.Text.Json;
 using System.Text.Json.Nodes;
+using System.Text.RegularExpressions;
 
 namespace Beef.CodeGen
 {
@@ -20,8 +23,29 @@ namespace Beef.CodeGen
     /// <param name="scripts">The <see cref="CodeGenScript"/>.</param>
     internal class CodeGenerator(ICodeGeneratorArgs args, CodeGenScript scripts) : OnRamp.CodeGenerator(args, scripts)
     {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "SYSLIB1045:Convert to 'GeneratedRegexAttribute'.", Justification = "Supporting multi-versions of .NET.")]
+        private static readonly Regex _seeRegex = new(@"<see cref=""(.*?)""/>", RegexOptions.Compiled);
+
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "SYSLIB1045:Convert to 'GeneratedRegexAttribute'.", Justification = "Supporting multi-versions of .NET.")]
+        private static readonly Regex _seeRefRegex = new(@" \((.*?)<see cref=""(.*?)""/>\)", RegexOptions.Compiled);
+
         private const string _entitiesName = "entities";
 
+        /// <summary>
+        /// Static constructor.
+        /// </summary>
+        static CodeGenerator()
+        {
+            Handlebars.RegisterHelper("sanitize-comments", (writer, context, args) =>
+            {
+                var ua = args.OfType<UndefinedBindingResult>().FirstOrDefault();
+                if (ua is not null)
+                    throw new CodeGenException($"Handlebars template invokes function 'sanitize-comments' that references '{ua.Value}' which is undefined.");
+
+                writer.WriteSafeString(_seeRegex.Replace(_seeRefRegex.Replace(args.FirstOrDefault()?.ToString() ?? "", ""), "<c>$1</c>").Replace("RefDataNamespace.", "").Replace("CollectionResult", "Collection").Replace("Collection</c>", "</c> array"));
+            });
+        }
+
         /// <inheritdoc/>
         /// <remarks>Will search for secondary (related) configuration files and will dynamically include (merge) the configured entities into the primary configuration.</remarks>
         protected override void OnConfigurationLoad(CodeGenScript script, string fileName, JsonNode json)
@@ -41,6 +65,9 @@ protected override void OnConfigurationLoad(CodeGenScript script, string fileNam
                 if (!Path.GetFileNameWithoutExtension(secondaryFile.FullName).EndsWith(root, StringComparison.OrdinalIgnoreCase))
                     continue;
 
+                if (secondaryFile.Name.Equals(CodeGenFileManager.TemporaryEntityFilename, StringComparison.OrdinalIgnoreCase))
+                    continue;
+
                 try
                 {
                     using var configReader = secondaryFile.OpenText();
diff --git a/tools/Beef.CodeGen.Core/CodeGeneratorArgsExtensions.cs b/tools/Beef.CodeGen.Core/CodeGeneratorArgsExtensions.cs
index f63300a5a..3ac5c0f61 100644
--- a/tools/Beef.CodeGen.Core/CodeGeneratorArgsExtensions.cs
+++ b/tools/Beef.CodeGen.Core/CodeGeneratorArgsExtensions.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Avanade. Licensed under the MIT License. See https://github.com/Avanade/Beef
 
-using CoreEx.Database;
+using Beef.CodeGen.OpenApi;
 using DbEx.Migration;
 using OnRamp;
 using System;
@@ -52,5 +52,12 @@ public static void ValidateCompanyAndAppName(this ICodeGeneratorArgs args)
         /// <param name="args">The arguments.</param>
         /// <param name="migrator">The <see cref="DatabaseMigrationBase"/> instance.</param>
         public static void AddDatabaseMigrator(this ICodeGeneratorArgs args, DatabaseMigrationBase migrator) => args.AddParameter(CodeGenConsole.DatabaseMigratorParamName, migrator ?? throw new ArgumentNullException(nameof(args)));
+
+        /// <summary>
+        /// Gets the <see cref="OpenApiArgs"/>.
+        /// </summary>
+        /// <param name="args">The <see cref="ICodeGeneratorArgs"/>.</param>
+        /// <returns>The <see cref="OpenApiArgs"/>.</returns>
+        public static OpenApiArgs? GetOpenApiArgs(this ICodeGeneratorArgs args) => args.GetParameter<OpenApiArgs>(nameof(OpenApiArgs), false)!;
     }
 }
\ No newline at end of file
diff --git a/tools/Beef.CodeGen.Core/CommandType.cs b/tools/Beef.CodeGen.Core/CommandType.cs
index 1fd9671bb..287c5595a 100644
--- a/tools/Beef.CodeGen.Core/CommandType.cs
+++ b/tools/Beef.CodeGen.Core/CommandType.cs
@@ -48,6 +48,11 @@ public enum CommandType
         /// <summary>
         /// Reports all the endpoints.
         /// </summary>
-        EndPoints = 8192
+        EndPoints = 8192,
+
+        /// <summary>
+        /// Parses and imports from an OpenAPI document into a temporary file.
+        /// </summary>
+        OpenApi = 16384
     }
 }
\ No newline at end of file
diff --git a/tools/Beef.CodeGen.Core/Config/Entity/EntityConfig.cs b/tools/Beef.CodeGen.Core/Config/Entity/EntityConfig.cs
index 85bbc5412..07d865f37 100644
--- a/tools/Beef.CodeGen.Core/Config/Entity/EntityConfig.cs
+++ b/tools/Beef.CodeGen.Core/Config/Entity/EntityConfig.cs
@@ -455,7 +455,7 @@ public class EntityConfig : ConfigBase<CodeGenConfig, CodeGenConfig>
         /// <summary>
         /// Indicates that a custom Database <c>Mapper</c> will be used; i.e. not generated.
         /// </summary>
-        [JsonPropertyName("databaseCustomerMapper")]
+        [JsonPropertyName("databaseCustomMapper")]
         [CodeGenProperty("Database", Title = "Indicates that a custom Database `Mapper` will be used; i.e. not generated.",
             Description = "Otherwise, by default, a `Mapper` will be generated.")]
         public bool? DatabaseCustomMapper { get; set; }
@@ -1947,6 +1947,7 @@ private void CheckDeprecatedProperties() => CodeGenConfig.WarnWhereDeprecated(Ro
             ("eventSubjectFormat", null, false),
             ("eventCasing", null, false),
             ("iValidator", null, false),
-            ("crud", " Use the new 'behavior' property with a value of 'crupd' to achieve same functionality.", true));
+            ("crud", " Use the new 'behavior' property with a value of 'crupd' to achieve same functionality.", true),
+            ("databaseCustomerMapper", "Use 'databaseCustomMappper' instead; this was a spelling mistake that has now been corrected.", true));
     }
 }
\ No newline at end of file
diff --git a/tools/Beef.CodeGen.Core/ExtendedHelp.txt b/tools/Beef.CodeGen.Core/ExtendedHelp.txt
index f1b259da4..e3b896cf2 100644
--- a/tools/Beef.CodeGen.Core/ExtendedHelp.txt
+++ b/tools/Beef.CodeGen.Core/ExtendedHelp.txt
@@ -1,9 +1,18 @@
 
 Extended commands and argument(s):
   clean       Cleans (removes) all related directories named 'Generated'.
-              - Use --param exclude=name[,name] to exclude named directory(s) from the clean.
+              - Use --param exclude=name[,name..] to exclude named directory(s) from the clean.
 
   count       Counts and reports the number of files and lines (All and Generated) within all related directories.
-              - Use --param exclude=name[,name] to exclude named directory(s) from the count.
+              - Use --param exclude=name[,name..] to exclude named directory(s) from the count.
 
   endpoints   Lists (audits) the code-generated endpoints and related configuration.
+
+  openapi     Parses an OpenAPI document and generates temporary Beef YAML configuration (preview).
+              - First argument is the OpenAPI document path (file or http(s)).
+              - Use --param include=[method:]path[,[method:]path..] to include named method (optional) and path (starts with).
+              - Use --param exclude=[method:]path[,[method:]path..] to exclude named method (optional) and path (starts with).
+              - Use --param ignore=[name[,name..]] to ignore named data types (.NET name).
+              - Use --param refdata=[name[,name..]] to identify reference data property names to automatically type.
+              - Use --param text=true|false to disable text attribute output.
+              - eg: dotnet run openapi "https://localhost/openapi.json" --param exclude=/ref --param ignore=changelog --param refdata=gender,outcome 
diff --git a/tools/Beef.CodeGen.Core/OpenApi/OpenApiArgs.cs b/tools/Beef.CodeGen.Core/OpenApi/OpenApiArgs.cs
new file mode 100644
index 000000000..c2c979467
--- /dev/null
+++ b/tools/Beef.CodeGen.Core/OpenApi/OpenApiArgs.cs
@@ -0,0 +1,117 @@
+using Microsoft.OpenApi.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Beef.CodeGen.OpenApi
+{
+    /// <summary>
+    /// Represents the OpenAPI arguments that are used to control the resulting Beef YAML-generation.
+    /// </summary>
+    public class OpenApiArgs
+    {
+        /// <summary>
+        /// Gets or sets the <see cref="StringComparer"/> to be used to determine the equality of the JSON property names to therefore include/exclude from the YAML generation.
+        /// </summary>
+        public StringComparer JsonNameComparer { get; set; } = StringComparer.OrdinalIgnoreCase;
+
+        /// <summary>
+        /// Indicates whether to reference the <see cref="OpenApiSchema"/> <see cref="OpenApiSchema.Enum"/> as reference data.
+        /// </summary>
+        /// <remarks>Where selected (default) then the underlying property data type will be denoted as reference data. Otherwise, the enums will be generated as the C# code equivalent (within the YAML).</remarks>
+        public bool EnumAsReferenceData { get; set; } = false;
+
+        /// <summary>
+        /// Gets or sets the array of starting characters that indicate that the parameter should be ignored (skipped).
+        /// </summary>
+        /// <remarks>The parameter name is used for character comparison.</remarks>
+        public char[] IgnoreParametersThatStartWith { get; set; } = ['$'];
+
+        /// <summary>
+        /// Gets or sets the type name suffix that is used where an underlying member name is the same.
+        /// </summary>
+        /// <remarks>Member names cannot be the same as their enclosing type: <see href="https://learn.microsoft.com/en-us/dotnet/csharp/misc/cs0542?f1url=%3FappId%3Droslyn%26k%3Dk(CS0542)"/>.</remarks>
+        public string TypeWithSameMemberNameSuffix { get; set; } = "X";
+
+        /// <summary>
+        /// Gets or sets the list of types that should be ignored (skipped).
+        /// </summary>
+        /// <remarks>Extend (add to) using command line: <c>--param ignore=[name[,name..]]</c></remarks>
+        public List<string> IgnoreTypes { get; set; } = [];
+
+        /// <summary>
+        /// Gets or sets the list of types that should be treated as reference data.
+        /// </summary>
+        /// <remarks>Extend (add to) using command line: <c>--param refdata=[name[,name..]]</c></remarks>
+        public List<string> RefDataTypes { get; set; } = [];
+
+        /// <summary>
+        /// Indicates whether to output the OpenApi text where applicable.
+        /// </summary>
+        /// <remarks>Override using command line: <c>--param text=true|false</c></remarks>
+        public bool OutputText { get; set; } = false;
+
+        /// <summary>
+        /// Get or sets the function to convert the OpenAPI name to the corresponding .NET name.
+        /// </summary>
+        public Func<OpenApiNameType, string, string>? ConvertDotNetName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the action that is invoked after the <see cref="OpenApiDocument"/> has been converted to the corresponding <see cref="YamlConfig"/>. 
+        /// </summary>
+        public Action<YamlConfig, OpenApiDocument>? OnYamlConfig { get; set; }
+
+        /// <summary>
+        /// Gets or sets the action that is invoked after all the operations (see <see cref="OpenApiOperation"/>) have been converted and added to the primary <see cref="YamlEntity"/>.
+        /// </summary>
+        public Action<YamlEntity, OpenApiDocument>? OnYamlPrimaryEntity { get; set; }
+
+        /// <summary>
+        /// Gets or sets the action that is invoked after the <see cref="OpenApiOperation"/> has been converted to the corresponding <see cref="YamlOperation"/>.
+        /// </summary>
+        /// <remarks>Defaults to <see cref="OnYamlOperationAutoValidator"/>.</remarks>
+        public Action<YamlOperation, OpenApiOperation>? OnYamlOperation { get; set; } = OnYamlOperationAutoValidator;
+
+        /// <summary>
+        /// Gets or sets the action that is invoked after the <see cref="OpenApiSchema"/> has been converted to the corresponding <see cref="YamlEntity"/>.
+        /// </summary>
+        /// <remarks>Defaults to <see cref="OnYamlEntityAutoSelectPrimaryKey"/>.</remarks>
+        public Action<YamlEntity, OpenApiSchema>? OnYamlEntity { get; set; } = OnYamlEntityAutoSelectPrimaryKey;
+
+        /// <summary>
+        /// Gets or sets the action that is invoked after the <see cref="OpenApiSchema"/> has been converted to the corresponding <see cref="YamlProperty"/>.
+        /// </summary>
+        public Action<YamlProperty, OpenApiSchema>? OnYamlProperty { get; set; }
+
+        /// <summary>
+        /// Gets or sets the action that is invoked after the <see cref="OpenApiSchema"/> has been converted to the corresponding <see cref="YamlEnum"/>.
+        /// </summary>
+        public Action<YamlEnum, OpenApiSchema>? OnYamlEnum { get; set; }
+
+        /// <summary>
+        /// Gets or sets the action that is invoked after the <see cref="OpenApiSchema"/> has been converted to the corresponding <see cref="YamlEnumValue"/>.
+        /// </summary>
+        public Action<YamlEnumValue, OpenApiSchema>? OnYamlEnumValue { get; set; }
+
+        /// <summary>
+        /// Provides out-of-the-box <see cref="OnYamlEntity"/> logic to determine the primary key property.
+        /// </summary>
+        public static Action<YamlEntity, OpenApiSchema> OnYamlEntityAutoSelectPrimaryKey { get; } = (entity, _) =>
+        {
+            var first = entity.Properties.FirstOrDefault();
+            if (first is not null && (first.Name!.Equals("Id", StringComparison.OrdinalIgnoreCase) || first.Name!.Equals(entity.Name! + "Id", StringComparison.OrdinalIgnoreCase)))
+                first.AddAttribute("primaryKey", true);
+        };
+
+        /// <summary>
+        /// Provides out-of-the-box <see cref="OnYamlEntity"/> logic to add a validator attribue.
+        /// </summary>
+        public static Action<YamlOperation, OpenApiOperation> OnYamlOperationAutoValidator { get; } = (operation, _) =>
+        {
+            var type = operation.Attributes["type"] as string;
+            var valueType = operation.Attributes["valueType"] as string;
+            if (type is not null && (type == "Create" || type == "Update"))
+                operation.AddAttribute("validator", valueType + "Validator");
+        };
+    }
+}
\ No newline at end of file
diff --git a/tools/Beef.CodeGen.Core/OpenApi/OpenApiConverter.cs b/tools/Beef.CodeGen.Core/OpenApi/OpenApiConverter.cs
new file mode 100644
index 000000000..b7fa18380
--- /dev/null
+++ b/tools/Beef.CodeGen.Core/OpenApi/OpenApiConverter.cs
@@ -0,0 +1,488 @@
+using CoreEx;
+using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Interfaces;
+using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Readers;
+using Microsoft.OpenApi.Writers;
+using OnRamp;
+using OnRamp.Utility;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Beef.CodeGen.OpenApi
+{
+    /// <summary>
+    /// Provides the ability to convert an OpenAPI document to an equivalent Beef-5 YAML configuration.
+    /// </summary>
+    public class OpenApiConverter
+    {
+        private static readonly char[] _separators = "^&*$!@#%*{}[]|:;\"'_- .,".ToCharArray();
+        private static readonly char[] _yamlEscapeChars = "!@#%*{}[]|:;\"'".ToCharArray();
+
+        private readonly OpenApiDocument _document;
+        private readonly YamlConfig _config;
+        private readonly CodeGeneratorArgs _codeGenArgs;
+        private readonly OpenApiArgs _openApiArgs;
+
+        /// <summary>
+        /// Read the OpenAPI document and create the <see cref="OpenApiConverter"/>.
+        /// </summary>
+        /// <param name="args">The <see cref="CodeGeneratorArgs"/>.</param>
+        /// <param name="path">The OpenAPI document path.</param>
+        /// <returns>The <see cref="OpenApiConverter"/>.</returns>
+        public static async Task<OpenApiConverter> ReadAsync(CodeGeneratorArgs args, string path)
+        {
+            var oasr = new OpenApiStreamReader(new OpenApiReaderSettings { });
+            OpenApiDocument oad;
+            OpenApiDiagnostic oadi;
+
+            try
+            {
+                if (File.Exists(path))
+                {
+                    using var sr = File.OpenRead(path);
+                    oad = oasr.Read(sr, out oadi);
+                }
+                else
+                {
+                    using var hr = new HttpClient();
+                    using var sr = await hr.GetStreamAsync(path).ConfigureAwait(false);
+                    oad = oasr.Read(sr, out oadi);
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new CodeGenException($"The OpenAPI document path '{path}' is invalid.", ex);
+            }
+
+            if (oadi.Errors.Count > 0)
+            {
+                var errors = string.Join(Environment.NewLine, oadi.Errors.Select(x => x.ToString()));
+                throw new CodeGenException($"The OpenAPI document '{path}' contains errors:{Environment.NewLine}{errors}");
+            }
+
+            return new OpenApiConverter(path, args, oad);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenApiConverter"/> class.
+        /// </summary>
+        private OpenApiConverter(string path, CodeGeneratorArgs args, OpenApiDocument document)
+        {
+            _document = document;
+            _codeGenArgs = args ?? throw new ArgumentNullException(nameof(args));
+            _openApiArgs = _codeGenArgs.GetOpenApiArgs() ?? new OpenApiArgs();
+
+            _openApiArgs.RefDataTypes.AddRange(_codeGenArgs.GetParameter<string>("refdata")?.Split(',', StringSplitOptions.RemoveEmptyEntries) ?? []);
+            _openApiArgs.IgnoreTypes.AddRange(_codeGenArgs.GetParameter<string>("ignore")?.Split(',', StringSplitOptions.RemoveEmptyEntries) ?? []);
+            if (_codeGenArgs.Parameters.TryGetValue("text", out var val) && val is string text)
+                _openApiArgs.OutputText = text.Equals("true", StringComparison.OrdinalIgnoreCase);
+
+            var sb = new StringBuilder($"openapi \"{path}\"");
+            foreach (var p in args.Parameters.Where(x => new List<string> { "include", "exclude", "ignore", "refdata", "text" }.Contains(x.Key, StringComparer.OrdinalIgnoreCase)))
+            {
+                sb.Append($" --param \"{p.Key}={p.Value}\"");
+            }
+
+            _config = new(null, sb.ToString(), _openApiArgs);
+        }
+
+        /// <summary>
+        /// Performs the conversion and outputs the YAML configuration.
+        /// </summary>
+        /// <returns>The YAML configuration <see cref="FileInfo"/>.</returns>
+        public async Task<FileInfo> ConvertAsync()
+        {
+            const string templateFileName = "OpenApi_yaml";
+
+            // Create the owning beef "entity" to house all the operations.
+            var ename = GetDotNetName(OpenApiNameType.Entity, _document.Info.Title) + "Service";
+            var entity = new YamlEntity(_document.Info.Title, string.IsNullOrWhiteSpace(ename) ? "NoTitleSpecifiedService" : ename);
+            entity.AddAttribute("excludeEntity", true);
+            if (_openApiArgs.OutputText)
+                entity.AddAttribute("text", _document.Info.Description);
+
+            static (string? method, string path) MethodPathSplitter(string text)
+            {
+                var parts = text.Trim().Split(':', StringSplitOptions.RemoveEmptyEntries);
+                if (parts.Length < 1 || parts.Length > 2)
+                    throw new CodeGenException($"The parameter must be in the format 'path' or 'method:path': {text}");
+
+                return parts.Length == 1 ? (null, parts[0]) : (parts[0], parts[1]);
+            }
+
+            // Filter and process each underlying API path (operation).
+            var exclude = (_codeGenArgs.GetParameter<string>("exclude")?.Split(',', StringSplitOptions.RemoveEmptyEntries) ?? []).Select(MethodPathSplitter).ToArray();
+            var include = (_codeGenArgs.GetParameter<string>("include")?.Split(',', StringSplitOptions.RemoveEmptyEntries) ?? []).Select(MethodPathSplitter).ToArray();
+
+            foreach (var oap in _document.Paths)
+            {
+                foreach (var ooo in oap.Value.Operations)
+                {
+                    if (exclude.Any(x => (x.method is null || x.method.Equals(ooo.Key.ToString(), StringComparison.OrdinalIgnoreCase)) && oap.Key.StartsWith(x.path, StringComparison.OrdinalIgnoreCase)))
+                        continue;
+
+                    if (include.Length == 0 || include.Any(x => (x.method is null || x.method.Equals(ooo.Key.ToString(), StringComparison.OrdinalIgnoreCase)) && oap.Key.StartsWith(x.path, StringComparison.OrdinalIgnoreCase)))
+                        CreateOperation(entity, new ApiOperation(oap.Key, ooo.Key, ooo.Value));
+                }
+            }
+
+            // Sort all the entities then add the owning entity so it appears first.
+            _config.Entities.Sort((x, y) => StringComparer.OrdinalIgnoreCase.Compare(x.Name, y.Name));
+            _config.Entities!.Insert(0, entity);
+
+            _config.Enums.Sort((x, y) => StringComparer.OrdinalIgnoreCase.Compare(x.Name, y.Name));
+
+            // Finalize the configurations.
+            _openApiArgs.OnYamlPrimaryEntity?.Invoke(entity, _document);
+            _openApiArgs.OnYamlConfig?.Invoke(_config, _document);
+
+            // Set the path/filename.
+            var fn = Path.Combine(OnRamp.Console.CodeGenConsole.GetBaseExeDirectory(), CodeGenFileManager.TemporaryEntityFilename);
+            var fi = new FileInfo(fn);
+
+            // Execute the code-generation proper and write contents (new or overwrite).
+            using var sr = StreamLocator.GetTemplateStreamReader(templateFileName, [.. _codeGenArgs.Assemblies], StreamLocator.HandlebarsExtensions).StreamReader!;
+            await File.WriteAllTextAsync(fi.FullName, new HandlebarsCodeGenerator(sr).Generate(_config)).ConfigureAwait(false);
+
+            return fi;
+        }
+
+        /// <summary>
+        /// Converts the operation.
+        /// </summary>
+        private void CreateOperation(YamlEntity entity, ApiOperation ao)
+        {
+            var operation = new YamlOperation(ao.Operation.OperationId, GetDotNetName(OpenApiNameType.Operation, ao.Operation.OperationId));
+
+            operation.AddAttribute("type", ao.Method switch
+            {
+                Microsoft.OpenApi.Models.OperationType.Get => "Get",
+                Microsoft.OpenApi.Models.OperationType.Post => "Create",
+                Microsoft.OpenApi.Models.OperationType.Put => "Update",
+                Microsoft.OpenApi.Models.OperationType.Patch => "Patch",
+                Microsoft.OpenApi.Models.OperationType.Delete => "Delete",
+                _ => "Custom"
+            });
+
+            // Add the parameters.
+            foreach (var p in ao.Operation.Parameters)
+            {
+                if (_openApiArgs.IgnoreParametersThatStartWith.Length > 0 && _openApiArgs.IgnoreParametersThatStartWith.Contains(p.Name.FirstOrDefault()))
+                    continue;
+
+                var pname = GetDotNetName(OpenApiNameType.Parameter, p.Name)!;
+                var pp = new YamlParameter(p.Name, pname);
+                pp.AddAttribute("type", GetDotNetType(pname, p.Schema), false, "string");
+                pp.AddAttribute("isMandatory", p.Required);
+                if (_openApiArgs.OutputText)
+                    pp.AddAttribute("text", FormatText(p.Description));
+
+                var comparer = _openApiArgs.JsonNameComparer;
+                if (comparer.Compare(p.Name, StringConverter.ToCamelCase(pp.Name)) != 0)
+                    pp.AddAttribute("argumentName", p.Name);
+
+                operation.Parameters.Add(pp);
+            }
+
+            // Add the request (body).
+            if (ao.Operation.RequestBody is not null)
+            {
+                if (ao.Operation.RequestBody.Reference is not null)
+                    operation.AddAttribute("valueType", GetDotNetType(ao.Operation.RequestBody));
+                else
+                {
+                    var content = ao.Operation.RequestBody.Content.FirstOrDefault();
+                    if (content.Value is not null && content.Value.Schema is not null)
+                        operation.AddAttribute("valueType", GetDotNetType(content.Value.Schema));
+                }
+            }
+
+            // Add the response (body); being the first 2XX response, - if any.
+            var response = ao.Operation.Responses.FirstOrDefault(x => x.Key.StartsWith('2'));
+            if (response.Value is null)
+                operation.AddAttribute("returnType", "void");
+            else if (response.Value.Reference is not null)
+                operation.AddAttribute("returnType", GetDotNetType(response.Value));
+            else
+            {
+                var content = response.Value.Content.FirstOrDefault();
+                if (content.Value is null || content.Value.Schema is null)
+                    operation.AddAttribute("returnType", "void");
+                else
+                    operation.AddAttribute("returnType", GetDotNetType(string.Empty, content.Value.Schema));
+            }
+
+            // Add the web api attributes.
+            operation.AddAttribute("webApiMethod", ao.Method switch
+            {
+                Microsoft.OpenApi.Models.OperationType.Get or Microsoft.OpenApi.Models.OperationType.Post or Microsoft.OpenApi.Models.OperationType.Put or Microsoft.OpenApi.Models.OperationType.Patch or Microsoft.OpenApi.Models.OperationType.Delete => null,
+                _ => "Http" + ao.Method.ToString()
+            });
+
+            operation.AddAttribute("webApiRoute", "'" + ao.Path + "'");
+            operation.AddAttribute("webApiStatus", response.Key is null ? "NoContent" : ((HttpStatusCode)int.Parse(response.Key)).ToString());
+
+            // Finish it!
+            if (_openApiArgs.OutputText)
+                operation.AddAttribute("text", FormatText(ao.Operation.Summary));
+
+            entity.Operations.Add(operation);
+            _openApiArgs.OnYamlOperation?.Invoke(operation, ao.Operation);
+        }
+
+        /// <summary>
+        /// Converts the schema to an entity.
+        /// </summary>
+        private YamlEntity CreateOrGetSchemaEntity(string name, OpenApiSchema schema, bool createWhereDifferences)
+        {
+            // Get the .NET name.
+            var ename = GetDotNetName(OpenApiNameType.Entity, name);
+            foreach (var p in schema.Properties)
+            {
+                // Rename where the type name is the same as a member name (not allowed in .NET).
+                var pname = GetDotNetName(OpenApiNameType.Property, p.Key);
+                if (ename == pname)
+                {
+                    ename += _openApiArgs.TypeWithSameMemberNameSuffix;
+                    break;
+                }
+            }
+
+            // Check if a faux entity is to be created as it should be ignored.
+            if (_openApiArgs.IgnoreTypes.Contains(ename, StringComparer.OrdinalIgnoreCase) || _openApiArgs.RefDataTypes.Contains(ename, StringComparer.OrdinalIgnoreCase))
+                return new YamlEntity(name, ename);
+
+            // Serialize to JSON for comparison.
+            using var sw = new StringWriter();
+            var oajw = new OpenApiJsonWriter(sw, new OpenApiJsonWriterSettings { Terse = true });
+            schema.SerializeAsV3WithoutReference(oajw);
+            var json = sw.ToString();
+
+            // Create entity where unique and further rename where applicable.
+            if (createWhereDifferences)
+            {
+                int count = 0;
+                while (true)
+                {
+                    var uename = count == 0 ? ename : $"{ename}{count}";
+                    var eentity = _config.Entities!.FirstOrDefault(x => x.Name == GetDotNetName(OpenApiNameType.Entity, uename));
+                    if (eentity is null)
+                    {
+                        ename = uename;
+                        break;
+                    }
+
+                    // Where same name and no differences in configuration then reuse.
+                    if (eentity.Json == json)
+                        return eentity;
+
+                    count++;
+                }
+            }
+            else
+            {
+                // Only create if not already exists.
+                var eentity = _config.Entities!.FirstOrDefault(x => x.Name == ename);
+                if (eentity is not null)
+                    return eentity;
+            }
+
+            var entity = new YamlEntity(name, ename) { Json = json };
+            if (_openApiArgs.OutputText)
+                entity.AddAttribute("text", FormatText(schema.Description));
+
+            _config.Entities!.Add(entity);
+
+            // Add all the properties.
+            string ApplyRefDataTypeNotation(string name, string type) => type == "string" && _openApiArgs.RefDataTypes.Contains(name, StringComparer.OrdinalIgnoreCase) ? "^" + name : type;
+
+            foreach (var prop in schema.Properties)
+            {
+                var pname = GetDotNetName(OpenApiNameType.Property, prop.Key)!;
+                var p = new YamlProperty(prop.Key, pname);
+                p.AddAttribute("type", ApplyRefDataTypeNotation(pname, GetDotNetType(pname, prop.Value)), false, "string");
+
+                var comparer = _openApiArgs.JsonNameComparer;
+                if (comparer.Compare(prop.Key, StringConverter.ToCamelCase(p.Name)) != 0)
+                    p.AddAttribute("jsonName", prop.Key);
+
+                if (_openApiArgs.OutputText)
+                    p.AddAttribute("text", FormatText(prop.Value.Description));
+
+                _openApiArgs.OnYamlProperty?.Invoke(p, prop.Value);
+                entity.Properties.Add(p);
+            }
+
+            // Remove any reference data text properties as not required.
+            var indexes = new List<int>();
+            foreach (var p in entity.Properties.Where(x => x.Attributes.Contains("type") && x.Attributes["type"]!.ToString()!.StartsWith('^')))
+            {
+                var index = entity.Properties.FindIndex(x => x.Name!.StartsWith(p.Name + "Text", StringComparison.OrdinalIgnoreCase));
+                if (index >= 0)
+                    indexes.Add(index);
+            }
+
+            foreach (var index in indexes.OrderBy(x => x).Reverse())
+            {
+                entity.Properties.RemoveAt(index);
+            }
+
+            // Done! Finalize.
+            _openApiArgs.OnYamlEntity?.Invoke(entity, schema);
+            return entity;
+        }
+
+        /// <summary>
+        /// Gets a .NET friendly name.
+        /// </summary>
+        private string GetDotNetName(OpenApiNameType type, string name)
+        {
+            name.ThrowIfNullOrEmpty(nameof(name));
+            var sb = new StringBuilder();
+            name.Split(_separators, StringSplitOptions.RemoveEmptyEntries).ForEach(part => sb.Append(StringConverter.ToPascalCase(part)));
+            return _openApiArgs.ConvertDotNetName is null ? sb.ToString() : _openApiArgs.ConvertDotNetName(type, sb.ToString());
+        }
+
+        /// <summary>
+        /// Format the text for YAML.
+        /// </summary>
+        private static string? FormatText(string text)
+        {
+            if (string.IsNullOrWhiteSpace(text))
+                return null;
+
+            text = string.Join(" ", text.TrimEnd().Replace("\r\n", " ").Replace("\r", " ").Replace("\n", " ").Split(' ', StringSplitOptions.RemoveEmptyEntries));
+            if (string.IsNullOrWhiteSpace(text))
+                return null;
+
+            if (!text.EndsWith('.'))
+                text += ".";
+
+            if (text.Any(c => _yamlEscapeChars.Contains(c)))
+                return "'+" + text.Replace("'", "''") + "'";
+            else
+                return "+" + text;
+        }
+
+        /// <summary>
+        /// Gets the equivalent .NET type.
+        /// </summary>
+        private string GetDotNetType(IOpenApiReferenceable reference)
+        {
+            var schema = _document.Components.Schemas[reference.Reference.Id];
+            return GetDotNetType(reference.Reference.Id, schema);
+        }
+
+        /// <summary>
+        /// Gets the equivalent .NET type.
+        /// </summary>
+        private string GetDotNetType(string pname, OpenApiSchema schema)
+        {
+            if (schema.Type == "string")
+            {
+                if (schema.Format == "date-time")
+                    return "DateTime" + (schema.Nullable ? "?" : string.Empty);
+                else if (schema.Format == "date")
+                    return "DateTime" + (schema.Nullable ? "?" : string.Empty);
+                else if (schema.Format == "time")
+                    return "TimeSpan" + (schema.Nullable ? "?" : string.Empty);
+                else
+                {
+                    if (schema.Reference is not null && schema.Reference.Id is not null)
+                    {
+                        var yenum = new YamlEnum(schema.Reference.Id, GetDotNetName(OpenApiNameType.Enum, schema.Reference.Id));
+                        if (_openApiArgs.OutputText)
+                            yenum.AddAttribute("text", FormatText(schema.Description));
+
+                        foreach (var v in (schema.Enum ?? []).OfType<OpenApiString>())
+                        {
+                            var yev = new YamlEnumValue(v.Value, GetDotNetName(OpenApiNameType.EnumValue, v.Value));
+                            _openApiArgs.OnYamlEnumValue?.Invoke(yev, schema);
+                            yenum.Values.Add(yev);
+                        }
+
+                        if (_config.Enums.FirstOrDefault(x => x.Name == yenum.Name) is null)
+                        {
+                            _openApiArgs.OnYamlEnum?.Invoke(yenum, schema);
+                            _config.Enums.Add(yenum);
+                        }
+
+                        return (_openApiArgs.EnumAsReferenceData ? "^" : "") + yenum.Name;
+                    }
+                    else
+                        return "string";
+                }
+            }
+            else if (schema.Type == "integer")
+            {
+                if (schema.Format == "int32")
+                    return "int" + (schema.Nullable ? "?" : string.Empty);
+                else if (schema.Format == "int64")
+                    return "long" + (schema.Nullable ? "?" : string.Empty);
+                else
+                    return "int" + (schema.Nullable ? "?" : string.Empty);
+            }
+            else if (schema.Type == "number")
+            {
+                if (schema.Format == "float")
+                    return "float" + (schema.Nullable ? "?" : string.Empty);
+                else if (schema.Format == "double")
+                    return "double" + (schema.Nullable ? "?" : string.Empty);
+                else
+                    return "decimal" + (schema.Nullable ? "?" : string.Empty);
+            }
+            else if (schema.Type == "boolean")
+            {
+                return "bool" + (schema.Nullable ? "?" : string.Empty);
+            }
+            else if (schema.Type == "array")
+            {
+                if (schema.Items.Type == "object")
+                {
+                    var aname = GetDotNetName(OpenApiNameType.Entity, schema.Items.Reference.Id);
+                    var entity = CreateOrGetSchemaEntity(aname, schema.Items, false);
+                    entity!.AddAttribute("collection", true);
+                    return entity.Name + "Collection";
+                }
+                else
+                    return "List<" + GetDotNetType(pname, schema.Items) + ">";
+            }
+            else
+            {
+                if (schema.Reference is not null && schema.Reference.Type == ReferenceType.Schema)
+                {
+                    if (_document.Components.Schemas.TryGetValue(schema.Reference.Id, out var refSchema))
+                        return CreateOrGetSchemaEntity(schema.Reference.Id, refSchema, false)!.Name!;
+
+                    return GetDotNetName(OpenApiNameType.Entity, schema.Reference.Id);
+                }
+
+                if (schema.Properties.Count == 0)
+                    return "object";
+
+                // Embedded object definition; therefore create a new _unique_ entity.
+                var entity = CreateOrGetSchemaEntity(pname, schema, true);
+                return entity.Name!;
+            }
+        }
+
+        /// <summary>
+        /// Represents the <see cref="OpenApiOperation"/> with the path and method.
+        /// </summary>
+        private class ApiOperation(string path, Microsoft.OpenApi.Models.OperationType method, OpenApiOperation operation)
+        {
+            public string Path { get; } = path;
+
+            public Microsoft.OpenApi.Models.OperationType Method { get; } = method;
+
+            public OpenApiOperation Operation { get; } = operation;
+        }
+    }
+}
\ No newline at end of file
diff --git a/tools/Beef.CodeGen.Core/OpenApi/OpenApiNameType.cs b/tools/Beef.CodeGen.Core/OpenApi/OpenApiNameType.cs
new file mode 100644
index 000000000..400a4630e
--- /dev/null
+++ b/tools/Beef.CodeGen.Core/OpenApi/OpenApiNameType.cs
@@ -0,0 +1,38 @@
+namespace Beef.CodeGen.OpenApi
+{
+    /// <summary>
+    /// Provides the OpenAPI name type.
+    /// </summary>
+    public enum OpenApiNameType
+    {
+        /// <summary>
+        /// Represents the entity name.
+        /// </summary>
+        Entity,
+
+        /// <summary>
+        /// Represents the property name.
+        /// </summary>
+        Property,
+
+        /// <summary>
+        /// Represents the operation name.
+        /// </summary>
+        Operation,
+
+        /// <summary>
+        /// Represents the parameter name.
+        /// </summary>
+        Parameter,
+
+        /// <summary>
+        /// Represents the enum name.
+        /// </summary>
+        Enum,
+
+        /// <summary>
+        /// Represents the enum value.
+        /// </summary>
+        EnumValue
+    }
+}
\ No newline at end of file
diff --git a/tools/Beef.CodeGen.Core/OpenApi/YamlConfig.cs b/tools/Beef.CodeGen.Core/OpenApi/YamlConfig.cs
new file mode 100644
index 000000000..2c8aaf5a1
--- /dev/null
+++ b/tools/Beef.CodeGen.Core/OpenApi/YamlConfig.cs
@@ -0,0 +1,155 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Xml.Linq;
+
+namespace Beef.CodeGen.OpenApi
+{
+    /// <summary>
+    /// Provides the base YAML configuration.
+    /// </summary>
+    public abstract class YamlBase(string? originalName, string name)
+    {
+        /// <summary>
+        /// Gets the original name.
+        /// </summary>
+        public string? OriginalName { get; } = originalName;
+
+        /// <summary>
+        /// Gets the .NET name.
+        /// </summary>
+        public string? Name { get; internal set; } = name;
+
+        /// <summary>
+        /// Gets the attributes.
+        /// </summary>
+        public OrderedDictionary Attributes { get; } = [];
+
+        /// <summary>
+        /// Adds the attribute to the entity where the <paramref name="value"/> is not its default value (unless <paramref name="allowDefault"/> is <c>true</c>).
+        /// </summary>
+        /// <param name="key">The key.</param>
+        /// <param name="value">The value.</param>
+        /// <param name="allowDefault">Indicates whether to allow the default value to be added.</param>
+        /// <param name="defaults">Options defaults to potentially skip.</param>
+        /// <remarks>Where the attribute with the specified <paramref name="key"/> already exists then no action will occur; i.e. will not override.</remarks>
+        public void AddAttribute<T>(string key, T? value, bool allowDefault = false, params T[] defaults)
+        {
+            if (Attributes.Contains(key))
+                return;
+
+            if (value is null)
+            {
+                if (allowDefault)
+                    Attributes.Add(key, "null");
+
+                return;
+            }
+
+            if (value is string s)
+            {
+                if (string.IsNullOrWhiteSpace(s) && !allowDefault)
+                    return;
+
+                if (defaults.Contains(value) && !allowDefault)
+                    return;
+
+                Attributes.Add(key, value);
+            }
+            else if (value is bool b)
+            {
+                if (!b && !allowDefault)
+                    return;
+
+                Attributes.Add(key, b.ToString().ToLowerInvariant());
+            }
+            else
+                throw new NotSupportedException($"The value type '{value?.GetType().Name}' is not supported.");
+        }
+
+        /// <summary>
+        /// Gets the summary text (if available).
+        /// </summary>
+        public string? SummaryText => Attributes["text"]?.ToString()?[2..^1];
+    }
+
+    /// <summary>
+    /// Represents the YAML root configuration.
+    /// </summary>
+    public class YamlConfig(string? originalName, string name, OpenApiArgs args) : YamlBase(originalName, name)
+    {
+        /// <summary>
+        /// Gets the <see cref="OpenApiArgs"/>.
+        /// </summary>
+        public OpenApiArgs Args { get; } = args;
+
+        /// <summary>
+        /// Gets the entities.
+        /// </summary>
+        public List<YamlEntity> Entities { get; } = [];
+
+        /// <summary>
+        /// Gets the enums.
+        /// </summary>
+        public List<YamlEnum> Enums { get; } = [];
+    }
+
+    /// <summary>
+    /// Represents the YAML entity.
+    /// </summary>
+    public class YamlEntity(string? originalName, string name) : YamlBase(originalName, name)
+    {
+        /// <summary>
+        /// Gets or sets the JSON V3 representation to enable uniqueness comparison.
+        /// </summary>
+        internal string? Json { get; set; }
+
+        /// <summary>
+        /// Gets the properties.
+        /// </summary>
+        public List<YamlProperty> Properties { get; } = [];
+
+        /// <summary>
+        /// Gets the operations.
+        /// </summary>
+        public List<YamlOperation> Operations { get; } = [];
+    }
+
+    /// <summary>
+    /// Represents the YAML property.
+    /// </summary>
+    public class YamlProperty(string? originalName, string name) : YamlBase(originalName, name) { }
+
+    /// <summary>
+    /// Represents the YAML operation.
+    /// </summary>
+    public class YamlOperation(string? originalName, string name) : YamlBase(originalName, name)
+    {
+        /// <summary>
+        /// Gets the parameters.
+        /// </summary>
+        public List<YamlParameter> Parameters { get; } = [];
+    }
+
+    /// <summary>
+    /// Represents the YAML parameter.
+    /// </summary>
+    public class YamlParameter(string? originalName, string name) : YamlBase(originalName, name) { }
+
+    /// <summary>
+    /// Represents the YAML enum.
+    /// </summary>
+    public class YamlEnum(string? originalName, string name) : YamlBase(originalName, name)
+    {
+        /// <summary>
+        /// Gets the enum values.
+        /// </summary>
+        public List<YamlEnumValue> Values { get; } = [];
+    }
+
+    /// <summary>
+    /// Represents the YAML enum value.
+    /// </summary>
+    public class YamlEnumValue(string? originalName, string name) : YamlBase(originalName, name) { }
+}
\ No newline at end of file
diff --git a/tools/Beef.CodeGen.Core/Schema/entity.beef-5.json b/tools/Beef.CodeGen.Core/Schema/entity.beef-5.json
index 266466e53..d91b74a97 100644
--- a/tools/Beef.CodeGen.Core/Schema/entity.beef-5.json
+++ b/tools/Beef.CodeGen.Core/Schema/entity.beef-5.json
@@ -627,7 +627,7 @@
           "type": "string",
           "title": "The name of the \u0060Mapper\u0060 that the generated Database \u0060Mapper\u0060 inherits from."
         },
-        "databaseCustomerMapper": {
+        "databaseCustomMapper": {
           "type": "boolean",
           "title": "Indicates that a custom Database \u0060Mapper\u0060 will be used; i.e. not generated.",
           "description": "Otherwise, by default, a \u0060Mapper\u0060 will be generated."
diff --git a/tools/Beef.CodeGen.Core/Templates/EntityWebApiController_cs.hbs b/tools/Beef.CodeGen.Core/Templates/EntityWebApiController_cs.hbs
index c57816923..5a32957c1 100644
--- a/tools/Beef.CodeGen.Core/Templates/EntityWebApiController_cs.hbs
+++ b/tools/Beef.CodeGen.Core/Templates/EntityWebApiController_cs.hbs
@@ -54,19 +54,19 @@ public partial class {{Name}}Controller : ControllerBase
 
   {{/unless}} 
     /// <summary>
-    /// {{{SummaryText}}}
+    /// {{{sanitize-comments SummaryText}}}
     /// </summary>
   {{#each CoreParameters}}
    {{#ifeq WebApiFrom 'FromEntityProperties'}}
      {{#each RelatedEntity.Properties}}
-    /// <param name="{{ArgumentName}}">{{{ParameterSummaryText}}}</param>
+    /// <param name="{{ArgumentName}}">{{{sanitize-comments ParameterSummaryText}}}</param>
      {{/each}}
    {{else}}
-    /// <param name="{{ArgumentName}}">{{{SummaryText}}}</param>
+    /// <param name="{{ArgumentName}}">{{{sanitize-comments SummaryText}}}</param>
    {{/ifeq}}
   {{/each}}
   {{#if HasReturnValue}}
-    /// <returns>{{{WebApiReturnText}}}</returns>
+    /// <returns>{{{sanitize-comments WebApiReturnText}}}</returns>
   {{/if}}
   {{#ifge WebApiTags.Count 1}}
     [Tags({{#each WebApiTags}}"{{.}}"{{#unless @last}}, {{/unless}}{{/each}})]
diff --git a/tools/Beef.CodeGen.Core/Templates/Model_cs.hbs b/tools/Beef.CodeGen.Core/Templates/Model_cs.hbs
index b407a9e9e..e787479db 100644
--- a/tools/Beef.CodeGen.Core/Templates/Model_cs.hbs
+++ b/tools/Beef.CodeGen.Core/Templates/Model_cs.hbs
@@ -42,7 +42,7 @@ using {{Root.UsingNamespace3}};{{set-value 'HasUsingStatement' true}}
 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}}{{SummaryText}}{{/if}}
+    /// {{#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}}
@@ -67,7 +67,7 @@ namespace {{#if Root.IsDataModel}}{{Root.NamespaceBusiness}}.Data.Model{{else}}{
         {{#unless Root.IsDataModel}}
           {{#ifeq RefDataText 'Optional' 'Always'}}
         /// <summary>
-        /// {{{SummaryRefDataText}}}
+        /// {{#ifeq Root.RuntimeEntityScope 'Common'}}{{sanitize-comments SummaryRefDataText}}{{else}}{{SummaryRefDataText}}{{/ifeq}}
         /// </summary>
             {{#ifval JsonName}}
               {{#ifeq Parent.JsonSerializer 'SystemText'}}
@@ -84,7 +84,7 @@ namespace {{#if Root.IsDataModel}}{{Root.NamespaceBusiness}}.Data.Model{{else}}{
     {{/unless}}
   {{/ifval}}
         /// <summary>
-        /// {{{ModelSummaryText}}}
+        /// {{#ifeq Root.RuntimeEntityScope 'Common'}}{{sanitize-comments ModelSummaryText}}{{else}}{{ModelSummaryText}}{{/ifeq}}
         /// </summary>
   {{#if Root.IsDataModel}}   
     {{#if DataModelSerializationIgnore}}
@@ -178,7 +178,7 @@ namespace {{#if Root.IsDataModel}}{{Root.NamespaceBusiness}}.Data.Model{{else}}{
 {{#if Collection}}
 
     /// <summary>
-    /// Represents the {{{EntityNameSeeComments}}} collection.
+    /// Represents the {{#ifeq Root.RuntimeEntityScope 'Common'}}{{sanitize-comments EntityNameSeeComments}}{{else}}{{EntityNameSeeComments}}{{/ifeq}} collection.
     /// </summary>
     public partial class {{{EntityCollectionName}}} : {{{CollectionInherits}}} { }
 {{/if}}
@@ -186,7 +186,7 @@ namespace {{#if Root.IsDataModel}}{{Root.NamespaceBusiness}}.Data.Model{{else}}{
   {{#unless Root.IsDataModel}}
 
     /// <summary>
-    /// Represents the {{{EntityNameSeeComments}}} collection result.
+    /// Represents the {{#ifeq Root.RuntimeEntityScope 'Common'}}{{sanitize-comments EntityNameSeeComments}}{{else}}{{EntityNameSeeComments}}{{/ifeq}} collection result.
     /// </summary>
     public class {{{EntityCollectionResultName}}} : {{{CollectionResultInherits}}}
     {
diff --git a/tools/Beef.CodeGen.Core/Templates/OpenApi_yaml.hbs b/tools/Beef.CodeGen.Core/Templates/OpenApi_yaml.hbs
new file mode 100644
index 000000000..3ae7a38c9
--- /dev/null
+++ b/tools/Beef.CodeGen.Core/Templates/OpenApi_yaml.hbs
@@ -0,0 +1,82 @@
+# dotnet run {{Name}}
+# - review the entities, properties and operations then copy into your destination YAML file under 'entities'.
+entities:
+{{#each Entities}}
+- { name: {{Name}}{{#each Attributes}}, {{@key}}: {{@value}}{{/each}}{{#ifne Properties.Count 0}},{{else}}{{#ifne Operations.Count 0}},{{/ifne}}{{/ifne}}
+  {{#each Properties}}
+    {{#if @first}}
+    properties: [
+    {{/if}}
+      { name: {{Name}}{{#each Attributes}}, {{@key}}: {{@value}}{{/each}} }{{#unless @last}},{{/unless}}
+    {{#if @last}}
+    ]{{#ifne ../Operations.Count 0}},{{/ifne}}
+    {{/if}}
+  {{/each}}
+  {{#each Operations}}
+    {{#if @first}}
+    operations: [
+    {{/if}}
+      { name: {{Name}}{{#each Attributes}}, {{@key}}: {{@value}}{{/each}}{{#ifeq Parameters.Count 0}} }{{#unless @last}},{{/unless}}{{else}},{{/ifeq}}
+    {{#each Parameters}}
+      {{#if @first}}
+        parameters: [
+      {{/if}}
+          { name: {{Name}}{{#each Attributes}}, {{@key}}: {{@value}}{{/each}} }{{#unless @last}},{{/unless}}
+      {{#if @last}}
+        ]
+      }{{#unless ../@last}},{{/unless}}
+      {{/if}}
+    {{/each}}
+    {{#if @last}}
+    ]
+    {{/if}}
+  {{/each}}
+  }
+  {{#unless @last}}
+
+  {{/unless}}
+{{/each}}
+{{#ifne Enums.Count 0}}
+
+  {{#if Args.EnumAsReferenceData}}
+# Enums converted to reference data entities.
+# - review the entities then copy into your destination YAML file under 'entities:'.
+refDataEntities:
+    {{#each Enums}}
+- { name: {{Name}}{{#each Attributes}}, {{@key}}: {{@value}}{{/each}} }
+    {{/each}}
+
+# Enums converted for reference data loading.
+# - review the data then copy into your destination YAML file (remove the merge '$' symbol as required).
+refDataData:
+    {{#each Enums}}
+      {{#unless @first}}
+
+      {{/unless}}
+- ${{Name}}:
+      {{#each Values}}
+  - {{OriginalName}}: {{sentence Name}}
+      {{/each}}
+    {{/each}}
+  {{else}}
+# Enums converted to c# code.
+# - review the C# code then copy into your appropriate destination file(s).
+enums: |
+    {{#each Enums}}
+      {{#unless @first}}
+
+      {{/unless}}
+      {{#ifval SummaryText}}
+  /// <summary>
+  /// {{SummaryText}}
+  /// </summary>
+      {{/ifval}}
+  public enum {{Name}}
+  {
+      {{#each Values}}
+      {{OriginalName}}{{#unless @last}},{{/unless}}
+      {{/each}}
+  }
+    {{/each}}
+  {{/if}}
+{{/ifne}}
\ No newline at end of file
diff --git a/tools/Beef.CodeGen.Core/Templates/ReferenceDataProvider_cs.hbs b/tools/Beef.CodeGen.Core/Templates/ReferenceDataProvider_cs.hbs
index de1a1c839..22a218f37 100644
--- a/tools/Beef.CodeGen.Core/Templates/ReferenceDataProvider_cs.hbs
+++ b/tools/Beef.CodeGen.Core/Templates/ReferenceDataProvider_cs.hbs
@@ -25,12 +25,12 @@ public partial class ReferenceDataProvider : IReferenceDataProvider
     partial void ReferenceDataProviderCtor(); // Enables the ReferenceDataProvider constructor to be extended.
 
     /// <inheritdoc/>
-    public Type[] Types => new Type[] 
-    {
+    public Type[] Types =>
+    [
 {{#each RefDataEntities}}
         typeof({{RefDataQualifiedEntityName}}){{#unless @last}},{{/unless}}
 {{/each}}
-    };
+    ];
 
     /// <inheritdoc/>
     public Task<Result<IReferenceDataCollection>> GetAsync(Type type, CancellationToken cancellationToken = default) => _dataService.GetAsync(type{{#if Root.CancellationToken}}, cancellationToken{{/if}});
diff --git a/tools/Beef.CodeGen.Core/Templates/ReferenceDataWebApiController_cs.hbs b/tools/Beef.CodeGen.Core/Templates/ReferenceDataWebApiController_cs.hbs
index 31fd024e0..59abf28a9 100644
--- a/tools/Beef.CodeGen.Core/Templates/ReferenceDataWebApiController_cs.hbs
+++ b/tools/Beef.CodeGen.Core/Templates/ReferenceDataWebApiController_cs.hbs
@@ -37,11 +37,11 @@ public partial class ReferenceDataController : ControllerBase
 
 {{#each RefDataEntities}}
     /// <summary> 
-    /// Gets all of the {{see-comments RefDataQualifiedEntityName}} reference data items that match the specified criteria.
+    /// Gets all of the '{{Name}}' reference data items that match the specified criteria.
     /// </summary>
     /// <param name="codes">The reference data code list.</param>
     /// <param name="text">The reference data text (including wildcards).</param>
-    /// <returns>A {{RefDataQualifiedEntityName}} collection.</returns>
+    /// <returns>The '{{Name}}' array.</returns>
   {{#ifge WebApiTags.Count 1}}
     [Tags({{#each WebApiTags}}"{{.}}"{{#unless @last}}, {{/unless}}{{/each}})]
   {{/ifge}}
@@ -57,7 +57,7 @@ public partial class ReferenceDataController : ControllerBase
     /// <summary>
     /// Gets the reference data entries for the specified entities and codes from the query string; e.g: {{Root.RefDataWebApiRoute}}?entity=codeX,codeY&amp;entity2=codeZ&amp;entity3
     /// </summary>
-    /// <returns>A <see cref="ReferenceDataMultiDictionary"/>.</returns>
+    /// <returns>The 'ReferenceDataMultiDictionary'.</returns>
 {{#ifval WebApiAuthorize}}
     [{{{WebApiAuthorize}}}]
 {{/ifval}}
diff --git a/tools/Beef.Database.Core/Beef.Database.Core.csproj b/tools/Beef.Database.Core/Beef.Database.Core.csproj
index 8e2c19ac8..336b7eee3 100644
--- a/tools/Beef.Database.Core/Beef.Database.Core.csproj
+++ b/tools/Beef.Database.Core/Beef.Database.Core.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.Database" Version="3.21.0" />
+    <PackageReference Include="CoreEx.Database" Version="3.21.1" />
     <PackageReference Include="DbEx" Version="2.5.8" />
   </ItemGroup>
 
diff --git a/tools/Beef.Database.Core/DatabaseMigratorExtensions.cs b/tools/Beef.Database.Core/DatabaseMigratorExtensions.cs
index 00b92672e..460a00222 100644
--- a/tools/Beef.Database.Core/DatabaseMigratorExtensions.cs
+++ b/tools/Beef.Database.Core/DatabaseMigratorExtensions.cs
@@ -98,7 +98,6 @@ public static Assembly[] AdjustArtefactResourceAssemblies(this DatabaseMigration
         public static async Task<(bool Success, string? Statistics)> ExecuteYamlCodeGenAsync(this DatabaseMigrationBase migrator, string? schema, string[] tables, CancellationToken cancellationToken = default)
         {
             const string templateFileName = "Entity_yaml";
-            const string tempFileName = "temp.entity.beef-5.yaml";
 
             // Infer database schema.
             migrator.Logger.LogInformation("{Content}", "  ** Code-generation of temporary entity YAML requested **");
@@ -126,7 +125,7 @@ public static Assembly[] AdjustArtefactResourceAssemblies(this DatabaseMigration
                 ?? throw new InvalidOperationException($"Embedded Template resource '{templateFileName}' is required and was not found within the selected assemblies.");
 
             // Set the path/filename.
-            var fn = Path.Combine(OnRamp.Console.CodeGenConsole.GetBaseExeDirectory(), tempFileName);
+            var fn = Path.Combine(OnRamp.Console.CodeGenConsole.GetBaseExeDirectory(), CodeGenFileManager.TemporaryEntityFilename);
             var fi = new FileInfo(fn);
 
             // Execute the code-generation proper and write contents (new or overwrite).
@@ -137,7 +136,7 @@ public static Assembly[] AdjustArtefactResourceAssemblies(this DatabaseMigration
             migrator.Logger.LogWarning("{Content}", $"Temporary entity file created: {fi.FullName}");
             migrator.Logger.LogInformation("{Content}", string.Empty);
             migrator.Logger.LogInformation("{Content}", "Copy and paste generated contents into their respective files and amend accordingly.");
-            migrator.Logger.LogInformation("{Content}", $"Once complete it is recommended that the '{tempFileName}' file is deleted, as it is otherwise not used.");
+            migrator.Logger.LogInformation("{Content}", $"Once complete it is recommended that the '{fi.Name}' file is deleted, as it is otherwise not used.");
 
             return (true, string.Empty);
         }
diff --git a/tools/Beef.Database.MySql/Beef.Database.MySql.csproj b/tools/Beef.Database.MySql/Beef.Database.MySql.csproj
index fcab6ffee..cd827867f 100644
--- a/tools/Beef.Database.MySql/Beef.Database.MySql.csproj
+++ b/tools/Beef.Database.MySql/Beef.Database.MySql.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.Database.MySql" Version="3.21.0" />
+    <PackageReference Include="CoreEx.Database.MySql" Version="3.21.1" />
     <PackageReference Include="DbEx.MySql" Version="2.5.8" />
   </ItemGroup>
 
diff --git a/tools/Beef.Database.Postgres/Beef.Database.Postgres.csproj b/tools/Beef.Database.Postgres/Beef.Database.Postgres.csproj
index 429f6a1a8..42b37b361 100644
--- a/tools/Beef.Database.Postgres/Beef.Database.Postgres.csproj
+++ b/tools/Beef.Database.Postgres/Beef.Database.Postgres.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.Database.Postgres" Version="3.21.0" />
+    <PackageReference Include="CoreEx.Database.Postgres" Version="3.21.1" />
     <PackageReference Include="DbEx.Postgres" Version="2.5.8" />
   </ItemGroup>
 
diff --git a/tools/Beef.Database.SqlServer/Beef.Database.SqlServer.csproj b/tools/Beef.Database.SqlServer/Beef.Database.SqlServer.csproj
index 1e6415b20..8ea5d359b 100644
--- a/tools/Beef.Database.SqlServer/Beef.Database.SqlServer.csproj
+++ b/tools/Beef.Database.SqlServer/Beef.Database.SqlServer.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.21.0" />
+    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.21.1" />
     <PackageReference Include="DbEx.SqlServer" Version="2.5.8" />
   </ItemGroup>
 
diff --git a/tools/Beef.Test.NUnit/Beef.Test.NUnit.csproj b/tools/Beef.Test.NUnit/Beef.Test.NUnit.csproj
index cfa5a3b3e..03cff57ac 100644
--- a/tools/Beef.Test.NUnit/Beef.Test.NUnit.csproj
+++ b/tools/Beef.Test.NUnit/Beef.Test.NUnit.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.21.0" />
+    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.21.1" />
   </ItemGroup>
 
   <Import Project="..\..\Common.targets" />